diff --git a/NOTICE b/NOTICE index 6303fab9b2..28c29dc218 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Apache ActiveMQ +Apache ActiveMQ Artemis Copyright [2014-2015] The Apache Software Foundation This product includes software developed at diff --git a/README.md b/README.md index f10c439389..9dc4087a6a 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,7 @@ class in the project tab and click "Run ". If the "Run " We have shared the style templates that are good for this project. If you want to apply them use these steps: * File->Import Settings -* Select the file under ./activemq6-cloned-folder/etc/IDEA-style.jar +* Select the file under ./artemis-cloned-folder/etc/IDEA-style.jar * Select both Code Style Templates and File templates (it's the default option) * Select OK and restart Idea @@ -234,7 +234,7 @@ Do not use the [maven-eclipse-plugin] to copy the files as it conflicts with [m2 The code repository for ActiveMQ Artemis is hosted by Apache org and lives here: https://git-wip-us.apache.org/repos/asf/activemq-6.git. -We also host a mirror of the ActiveMQ repository on GitHub: https://github.com/apache/activemq-6. We use this mirror for all code submissions and reviews. To submit code to ActiveMQ Artemis please open a Pull Request as outlined as part of the GitHub workflow described here: https://guides.github.com/introduction/flow/index.html. Once a pull request is opened it will be reviewed and commented on. Any further changes as a result of comments / review process should be addressed and reflected in the original pull request as outlined in the GitHub workflow. When the pull request has went through the review process and ready to merge, the reviewer should comment with "Ack, Ready to Push". Once an Ack message is received one of the ActiveMQ Artemis core team members will push the changes to upstream Apache ActiveMQ Artemis repository and close the pull request. +We also host a mirror of the ActiveMQ Artemis repository on GitHub: https://github.com/apache/activemq-6. We use this mirror for all code submissions and reviews. To submit code to ActiveMQ Artemis please open a Pull Request as outlined as part of the GitHub workflow described here: https://guides.github.com/introduction/flow/index.html. Once a pull request is opened it will be reviewed and commented on. Any further changes as a result of comments / review process should be addressed and reflected in the original pull request as outlined in the GitHub workflow. When the pull request has went through the review process and ready to merge, the reviewer should comment with "Ack, Ready to Push". Once an Ack message is received one of the ActiveMQ Artemis core team members will push the changes to upstream Apache ActiveMQ Artemis repository and close the pull request. ### Commit Messages @@ -279,7 +279,7 @@ To setup repositories for reviewing and pushing: # Clone the GitHub Mirror of ActiveMQ Artemis Repo: git clone git@github.com:apache/activemq-6.git - # Add the following section to your /.git/config statement to fetch all pull requests sent to the GitHub mirror. Note that the remote name for git@github.com:apache/activemq-6.git may be different. Be sure to edit all references to the remote name. In this case "activemq". + # Add the following section to your /.git/config statement to fetch all pull requests sent to the GitHub mirror. Note that the remote name for git@github.com:apache/activemq-6.git may be different. Be sure to edit all references to the remote name. In this case "activemq". [remote "origin"] url = git@github.com:apache/activemq-6.git @@ -297,7 +297,7 @@ To setup repositories for reviewing and pushing: To push commits from a pull request to the apache repository: ```bash - cd + cd # Download all the remote branches etc... including all the pull requests. git fetch --all diff --git a/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt b/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt deleted file mode 100644 index a3c04d78f5..0000000000 --- a/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt +++ /dev/null @@ -1,8 +0,0 @@ - _ _ _ __ __ ___ - / \ ___| |_(_)_ _____| \/ |/ _ \ - / _ \ / __| __| | \ / / _ \ |\/| | | | | - / ___ \ (__| |_| |\ V / __/ | | | |_| | - /_/ \_\___|\__|_| \_/ \___|_| |_|\__\_\ - Apache ActiveMQ ${project.version} - - diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java deleted file mode 100644 index 694f332fba..0000000000 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java +++ /dev/null @@ -1,487 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.protocol.core.impl; - -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY_V2; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY_V3; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CREATESESSION; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CREATESESSION_RESP; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CREATE_QUEUE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.DELETE_QUEUE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.DISCONNECT; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.DISCONNECT_V2; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.DISCONNECT_CONSUMER; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.EXCEPTION; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.NULL_RESPONSE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.PACKETS_CONFIRMED; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.PING; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REATTACH_SESSION; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REATTACH_SESSION_RESP; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CHECK_FOR_FAILOVER; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_ADD_METADATA; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_ADD_METADATA2; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY_RESP; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY_RESP_V2; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_CLOSE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_COMMIT; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_CONSUMER_CLOSE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_CREATECONSUMER; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_EXPIRED; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_FLOWTOKEN; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_INDIVIDUAL_ACKNOWLEDGE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_CREDITS; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_FAIL_CREDITS; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_REQUEST_CREDITS; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY_RESP; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY_RESP_V2; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_CONTINUATION; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_START; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_STOP; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_UNIQUE_ADD_METADATA; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_END; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_FAILED; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_FORGET; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT_RESP; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS_RESP; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_JOIN; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_PREPARE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_RESP; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_RESUME; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_ROLLBACK; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT_RESP; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_START; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_SUSPEND; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SUBSCRIBE_TOPOLOGY; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SUBSCRIBE_TOPOLOGY_V2; - -import java.io.Serializable; - -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.wireformat.CheckFailoverMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectMessage_V2; -import org.apache.activemq.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.NullResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.PacketsConfirmedMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.Ping; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReattachSessionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.RollbackMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage_V2; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionCloseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionCommitMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionExpireMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage_V2; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXACommitMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAEndMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAForgetMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAJoinMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAResumeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXARollbackMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAStartMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; - -public abstract class PacketDecoder implements Serializable -{ - public abstract Packet decode(final ActiveMQBuffer in); - - public Packet decode(byte packetType) - { - Packet packet; - - switch (packetType) - { - case PING: - { - packet = new Ping(); - break; - } - case DISCONNECT: - { - packet = new DisconnectMessage(); - break; - } - case DISCONNECT_V2: - { - packet = new DisconnectMessage_V2(); - break; - } - case DISCONNECT_CONSUMER: - { - packet = new DisconnectConsumerMessage(); - break; - } - case EXCEPTION: - { - packet = new ActiveMQExceptionMessage(); - break; - } - case PACKETS_CONFIRMED: - { - packet = new PacketsConfirmedMessage(); - break; - } - case CREATESESSION: - { - packet = new CreateSessionMessage(); - break; - } - case CHECK_FOR_FAILOVER: - { - packet = new CheckFailoverMessage(); - break; - } - case CREATESESSION_RESP: - { - packet = new CreateSessionResponseMessage(); - break; - } - case REATTACH_SESSION: - { - packet = new ReattachSessionMessage(); - break; - } - case REATTACH_SESSION_RESP: - { - packet = new ReattachSessionResponseMessage(); - break; - } - case SESS_CLOSE: - { - packet = new SessionCloseMessage(); - break; - } - case SESS_CREATECONSUMER: - { - packet = new SessionCreateConsumerMessage(); - break; - } - case SESS_ACKNOWLEDGE: - { - packet = new SessionAcknowledgeMessage(); - break; - } - case SESS_EXPIRED: - { - packet = new SessionExpireMessage(); - break; - } - case SESS_COMMIT: - { - packet = new SessionCommitMessage(); - break; - } - case SESS_ROLLBACK: - { - packet = new RollbackMessage(); - break; - } - case SESS_QUEUEQUERY: - { - packet = new SessionQueueQueryMessage(); - break; - } - case SESS_QUEUEQUERY_RESP: - { - packet = new SessionQueueQueryResponseMessage(); - break; - } - case SESS_QUEUEQUERY_RESP_V2: - { - packet = new SessionQueueQueryResponseMessage_V2(); - break; - } - case CREATE_QUEUE: - { - packet = new CreateQueueMessage(); - break; - } - case CREATE_SHARED_QUEUE: - { - packet = new CreateSharedQueueMessage(); - break; - } - case DELETE_QUEUE: - { - packet = new SessionDeleteQueueMessage(); - break; - } - case SESS_BINDINGQUERY: - { - packet = new SessionBindingQueryMessage(); - break; - } - case SESS_BINDINGQUERY_RESP: - { - packet = new SessionBindingQueryResponseMessage(); - break; - } - case SESS_BINDINGQUERY_RESP_V2: - { - packet = new SessionBindingQueryResponseMessage_V2(); - break; - } - case SESS_XA_START: - { - packet = new SessionXAStartMessage(); - break; - } - case SESS_XA_FAILED: - { - packet = new SessionXAAfterFailedMessage(); - break; - } - case SESS_XA_END: - { - packet = new SessionXAEndMessage(); - break; - } - case SESS_XA_COMMIT: - { - packet = new SessionXACommitMessage(); - break; - } - case SESS_XA_PREPARE: - { - packet = new SessionXAPrepareMessage(); - break; - } - case SESS_XA_RESP: - { - packet = new SessionXAResponseMessage(); - break; - } - case SESS_XA_ROLLBACK: - { - packet = new SessionXARollbackMessage(); - break; - } - case SESS_XA_JOIN: - { - packet = new SessionXAJoinMessage(); - break; - } - case SESS_XA_SUSPEND: - { - packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND); - break; - } - case SESS_XA_RESUME: - { - packet = new SessionXAResumeMessage(); - break; - } - case SESS_XA_FORGET: - { - packet = new SessionXAForgetMessage(); - break; - } - case SESS_XA_INDOUBT_XIDS: - { - packet = new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS); - break; - } - case SESS_XA_INDOUBT_XIDS_RESP: - { - packet = new SessionXAGetInDoubtXidsResponseMessage(); - break; - } - case SESS_XA_SET_TIMEOUT: - { - packet = new SessionXASetTimeoutMessage(); - break; - } - case SESS_XA_SET_TIMEOUT_RESP: - { - packet = new SessionXASetTimeoutResponseMessage(); - break; - } - case SESS_XA_GET_TIMEOUT: - { - packet = new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT); - break; - } - case SESS_XA_GET_TIMEOUT_RESP: - { - packet = new SessionXAGetTimeoutResponseMessage(); - break; - } - case SESS_START: - { - packet = new PacketImpl(PacketImpl.SESS_START); - break; - } - case SESS_STOP: - { - packet = new PacketImpl(PacketImpl.SESS_STOP); - break; - } - case SESS_FLOWTOKEN: - { - packet = new SessionConsumerFlowCreditMessage(); - break; - } - case SESS_CONSUMER_CLOSE: - { - packet = new SessionConsumerCloseMessage(); - break; - } - case SESS_INDIVIDUAL_ACKNOWLEDGE: - { - packet = new SessionIndividualAcknowledgeMessage(); - break; - } - case NULL_RESPONSE: - { - packet = new NullResponseMessage(); - break; - } - case SESS_RECEIVE_CONTINUATION: - { - packet = new SessionReceiveContinuationMessage(); - break; - } - case SESS_SEND_CONTINUATION: - { - packet = new SessionSendContinuationMessage(); - break; - } - case SESS_PRODUCER_REQUEST_CREDITS: - { - packet = new SessionRequestProducerCreditsMessage(); - break; - } - case SESS_PRODUCER_CREDITS: - { - packet = new SessionProducerCreditsMessage(); - break; - } - case SESS_PRODUCER_FAIL_CREDITS: - { - packet = new SessionProducerCreditsFailMessage(); - break; - } - case SESS_FORCE_CONSUMER_DELIVERY: - { - packet = new SessionForceConsumerDelivery(); - break; - } - case CLUSTER_TOPOLOGY: - { - packet = new ClusterTopologyChangeMessage(); - break; - } - case CLUSTER_TOPOLOGY_V2: - { - packet = new ClusterTopologyChangeMessage_V2(); - break; - } - case CLUSTER_TOPOLOGY_V3: - { - packet = new ClusterTopologyChangeMessage_V3(); - break; - } - case SUBSCRIBE_TOPOLOGY: - { - packet = new SubscribeClusterTopologyUpdatesMessage(); - break; - } - case SUBSCRIBE_TOPOLOGY_V2: - { - packet = new SubscribeClusterTopologyUpdatesMessageV2(); - break; - } - case SESS_ADD_METADATA: - { - packet = new SessionAddMetaDataMessage(); - break; - } - case SESS_ADD_METADATA2: - { - packet = new SessionAddMetaDataMessageV2(); - break; - } - case SESS_UNIQUE_ADD_METADATA: - { - packet = new SessionUniqueAddMetaDataMessage(); - break; - } - case PacketImpl.CHECK_FOR_FAILOVER_REPLY: - { - packet = new CheckFailoverReplyMessage(); - break; - } - default: - { - throw ActiveMQClientMessageBundle.BUNDLE.invalidType(packetType); - } - } - - return packet; - } - -} diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java deleted file mode 100644 index be2300e078..0000000000 --- a/activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.reader; \ No newline at end of file diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java deleted file mode 100644 index f7551392bb..0000000000 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.utils; - diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java deleted file mode 100644 index a50295b8bf..0000000000 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.api.jms.management; - diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java deleted file mode 100644 index 236a7dd579..0000000000 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.jms.client; - diff --git a/activemq-native/bin/libactivemqAIO32.so b/activemq-native/bin/libactivemqAIO32.so deleted file mode 100755 index 80fdc31edc..0000000000 Binary files a/activemq-native/bin/libactivemqAIO32.so and /dev/null differ diff --git a/activemq-native/bin/libactivemqAIO64.so b/activemq-native/bin/libactivemqAIO64.so deleted file mode 100755 index 86689f2319..0000000000 Binary files a/activemq-native/bin/libactivemqAIO64.so and /dev/null differ diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/package-info.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/package-info.java deleted file mode 100644 index 00745f6fac..0000000000 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.protocol.proton.converter.jms; \ No newline at end of file diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/package-info.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/package-info.java deleted file mode 100644 index e8b06df631..0000000000 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.protocol.proton.plug; \ No newline at end of file diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory b/activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory deleted file mode 100644 index 8f035c7ea5..0000000000 --- a/activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory +++ /dev/null @@ -1 +0,0 @@ -org.apache.activemq.core.protocol.proton.ProtonProtocolManagerFactory \ No newline at end of file diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory b/activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory deleted file mode 100644 index 82f81bf4e1..0000000000 --- a/activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory +++ /dev/null @@ -1 +0,0 @@ -org.apache.activemq.core.protocol.openwire.OpenWireProtocolManagerFactory diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory b/activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory deleted file mode 100644 index 7983da8a5d..0000000000 --- a/activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory +++ /dev/null @@ -1 +0,0 @@ -org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory \ No newline at end of file diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java deleted file mode 100644 index 1011561e8e..0000000000 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java +++ /dev/null @@ -1,235 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.protocol; - -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT_REPLY; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.NODE_ANNOUNCE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST_RESPONSE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.QUORUM_VOTE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.QUORUM_VOTE_REPLY; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND_TX; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_COMMIT_ROLLBACK; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE_TX; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_END; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_EVENT; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_WRITE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_PREPARE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_RESPONSE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SCALEDOWN_ANNOUNCEMENT; - -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupRegistrationMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterConnectMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.NodeAnnounceMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupRequestMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationCommitMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendLargeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; - -public class ServerPacketDecoder extends ClientPacketDecoder -{ - private static final long serialVersionUID = 3348673114388400766L; - public static final ServerPacketDecoder INSTANCE = new ServerPacketDecoder(); - - @Override - public Packet decode(final ActiveMQBuffer in) - { - final byte packetType = in.readByte(); - - Packet packet; - - switch (packetType) - { - - case SESS_SEND: - { - packet = new SessionSendMessage(new ServerMessageImpl()); - break; - } - case SESS_SEND_LARGE: - { - packet = new SessionSendLargeMessage(new ServerMessageImpl()); - break; - } - case REPLICATION_APPEND: - { - packet = new ReplicationAddMessage(); - break; - } - case REPLICATION_APPEND_TX: - { - packet = new ReplicationAddTXMessage(); - break; - } - case REPLICATION_DELETE: - { - packet = new ReplicationDeleteMessage(); - break; - } - case REPLICATION_DELETE_TX: - { - packet = new ReplicationDeleteTXMessage(); - break; - } - case REPLICATION_PREPARE: - { - packet = new ReplicationPrepareMessage(); - break; - } - case REPLICATION_COMMIT_ROLLBACK: - { - packet = new ReplicationCommitMessage(); - break; - } - case REPLICATION_RESPONSE: - { - packet = new ReplicationResponseMessage(); - break; - } - case REPLICATION_PAGE_WRITE: - { - packet = new ReplicationPageWriteMessage(); - break; - } - case REPLICATION_PAGE_EVENT: - { - packet = new ReplicationPageEventMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_BEGIN: - { - packet = new ReplicationLargeMessageBeginMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_END: - { - packet = new ReplicationLargeMessageEndMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_WRITE: - { - packet = new ReplicationLargeMessageWriteMessage(); - break; - } - case PacketImpl.BACKUP_REGISTRATION: - { - packet = new BackupRegistrationMessage(); - break; - } - case PacketImpl.BACKUP_REGISTRATION_FAILED: - { - packet = new BackupReplicationStartFailedMessage(); - break; - } - case PacketImpl.REPLICATION_START_FINISH_SYNC: - { - packet = new ReplicationStartSyncMessage(); - break; - } - case PacketImpl.REPLICATION_SYNC_FILE: - { - packet = new ReplicationSyncFileMessage(); - break; - } - case PacketImpl.REPLICATION_SCHEDULED_FAILOVER: - { - packet = new ReplicationLiveIsStoppingMessage(); - break; - } - case CLUSTER_CONNECT: - { - packet = new ClusterConnectMessage(); - break; - } - case CLUSTER_CONNECT_REPLY: - { - packet = new ClusterConnectReplyMessage(); - break; - } - case NODE_ANNOUNCE: - { - packet = new NodeAnnounceMessage(); - break; - } - case BACKUP_REQUEST: - { - packet = new BackupRequestMessage(); - break; - } - case BACKUP_REQUEST_RESPONSE: - { - packet = new BackupResponseMessage(); - break; - } - case QUORUM_VOTE: - { - packet = new QuorumVoteMessage(); - break; - } - case QUORUM_VOTE_REPLY: - { - packet = new QuorumVoteReplyMessage(); - break; - } - case SCALEDOWN_ANNOUNCEMENT: - { - packet = new ScaleDownAnnounceMessage(); - break; - } - default: - { - packet = super.decode(packetType); - } - } - - packet.decode(in); - - return packet; - } - -} diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java deleted file mode 100644 index 69f6f3c842..0000000000 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.spi.core.security; - diff --git a/activemq-service-extensions/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator b/activemq-service-extensions/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator deleted file mode 100644 index c4bc639d2f..0000000000 --- a/activemq-service-extensions/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator +++ /dev/null @@ -1 +0,0 @@ -org.apache.activemq.service.extensions.tests.transactions.DummyTransactionManagerLocator \ No newline at end of file diff --git a/activemq-boot/pom.xml b/artemis-boot/pom.xml similarity index 92% rename from activemq-boot/pom.xml rename to artemis-boot/pom.xml index b13d1f1ee8..95527ecc93 100644 --- a/activemq-boot/pom.xml +++ b/artemis-boot/pom.xml @@ -22,12 +22,12 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT .. - activemq-boot + artemis-boot jar ActiveMQ Artemis Boot diff --git a/activemq-boot/src/main/java/org/apache/activemq/boot/ActiveMQ.java b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java similarity index 96% rename from activemq-boot/src/main/java/org/apache/activemq/boot/ActiveMQ.java rename to artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java index afe965f27d..5182c54b34 100644 --- a/activemq-boot/src/main/java/org/apache/activemq/boot/ActiveMQ.java +++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.boot; +package org.apache.activemq.artemis.boot; import java.io.File; import java.lang.reflect.InvocationTargetException; @@ -98,7 +98,7 @@ public class ActiveMQ // Now setup our classloader.. URLClassLoader loader = new URLClassLoader(urls.toArray(new URL[urls.size()])); Thread.currentThread().setContextClassLoader(loader); - Class clazz = loader.loadClass("org.apache.activemq.cli.ActiveMQ"); + Class clazz = loader.loadClass("org.apache.activemq.artemis.cli.ActiveMQ"); Method method = clazz.getMethod("main", args.getClass()); try { diff --git a/activemq-bootstrap/pom.xml b/artemis-bootstrap/pom.xml similarity index 90% rename from activemq-bootstrap/pom.xml rename to artemis-bootstrap/pom.xml index 1fd4bc55d3..9868d6e9ad 100644 --- a/activemq-bootstrap/pom.xml +++ b/artemis-bootstrap/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-bootstrap + artemis-bootstrap jar ActiveMQ Artemis Bootstrap @@ -34,17 +34,17 @@ org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} org.apache.activemq - activemq-dto + artemis-dto ${project.version} @@ -76,19 +76,19 @@ org.apache.activemq - activemq-amqp-protocol + artemis-amqp-protocol ${project.version} test org.apache.activemq - activemq-stomp-protocol + artemis-stomp-protocol ${project.version} test org.apache.activemq - activemq-openwire-protocol + artemis-openwire-protocol ${project.version} test diff --git a/artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt b/artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt new file mode 100644 index 0000000000..7b6aadeb2c --- /dev/null +++ b/artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt @@ -0,0 +1,8 @@ + _ _ _ + / \ ____| |_ ___ __ __(_) _____ + / _ \| _ \ __|/ _ \ \/ | |/ __/ + / ___ \ | \/ |_/ __/ |\/| | |\___ \ + /_/ \_\| \__\____|_| |_|_|/___ / + Apache ActiveMQ Artemis ${project.version} + + diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java similarity index 87% rename from activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java index 64947c315e..194ad44c96 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.cli; +package org.apache.activemq.artemis.cli; import io.airlift.command.Cli; import io.airlift.command.ParseArgumentsUnexpectedException; -import org.apache.activemq.cli.commands.Action; -import org.apache.activemq.cli.commands.ActionContext; -import org.apache.activemq.cli.commands.Create; -import org.apache.activemq.cli.commands.HelpAction; -import org.apache.activemq.cli.commands.Run; -import org.apache.activemq.cli.commands.Stop; +import org.apache.activemq.artemis.cli.commands.Action; +import org.apache.activemq.artemis.cli.commands.ActionContext; +import org.apache.activemq.artemis.cli.commands.Create; +import org.apache.activemq.artemis.cli.commands.HelpAction; +import org.apache.activemq.artemis.cli.commands.Run; +import org.apache.activemq.artemis.cli.commands.Stop; import java.io.InputStream; import java.io.OutputStream; diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ConfigurationException.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ConfigurationException.java similarity index 95% rename from activemq-bootstrap/src/main/java/org/apache/activemq/cli/ConfigurationException.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ConfigurationException.java index b9f9ab03d2..2e8f9d98ec 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/ConfigurationException.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ConfigurationException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.cli; +package org.apache.activemq.artemis.cli; public class ConfigurationException extends Exception { diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Action.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Action.java similarity index 94% rename from activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Action.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Action.java index d2d17588b9..f2f0426fc8 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Action.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Action.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.cli.commands; +package org.apache.activemq.artemis.cli.commands; public interface Action { diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/ActionContext.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/ActionContext.java similarity index 96% rename from activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/ActionContext.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/ActionContext.java index 13b76cde52..a7ac12ad59 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/ActionContext.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/ActionContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.cli.commands; +package org.apache.activemq.artemis.cli.commands; import java.io.InputStream; import java.io.PrintStream; diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Create.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java similarity index 99% rename from activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Create.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java index 49f7164bdf..7618de50f5 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Create.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java @@ -1,4 +1,4 @@ -package org.apache.activemq.cli.commands; +package org.apache.activemq.artemis.cli.commands; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/HelpAction.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/HelpAction.java similarity index 95% rename from activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/HelpAction.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/HelpAction.java index 282ad77c61..a5d467ce50 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/HelpAction.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/HelpAction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.cli.commands; +package org.apache.activemq.artemis.cli.commands; import io.airlift.command.Help; diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java similarity index 87% rename from activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java index b238d8a694..a8e505c6ff 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.cli.commands; +package org.apache.activemq.artemis.cli.commands; import io.airlift.command.Arguments; import io.airlift.command.Command; -import org.apache.activemq.cli.ActiveMQ; -import org.apache.activemq.components.ExternalComponent; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.dto.BrokerDTO; -import org.apache.activemq.dto.ComponentDTO; -import org.apache.activemq.factory.BrokerFactory; -import org.apache.activemq.factory.SecurityManagerFactory; -import org.apache.activemq.integration.Broker; -import org.apache.activemq.integration.bootstrap.ActiveMQBootstrapLogger; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.cli.ActiveMQ; +import org.apache.activemq.artemis.components.ExternalComponent; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.dto.BrokerDTO; +import org.apache.activemq.artemis.dto.ComponentDTO; +import org.apache.activemq.artemis.factory.BrokerFactory; +import org.apache.activemq.artemis.factory.SecurityManagerFactory; +import org.apache.activemq.artemis.integration.Broker; +import org.apache.activemq.artemis.integration.bootstrap.ActiveMQBootstrapLogger; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; import java.io.File; import java.net.URI; diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java similarity index 93% rename from activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java index 225f4bf7c7..0c4028c00c 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.cli.commands; +package org.apache.activemq.artemis.cli.commands; import io.airlift.command.Arguments; import io.airlift.command.Command; -import org.apache.activemq.dto.BrokerDTO; -import org.apache.activemq.factory.BrokerFactory; +import org.apache.activemq.artemis.dto.BrokerDTO; +import org.apache.activemq.artemis.factory.BrokerFactory; import java.io.File; import java.net.URI; diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/components/ExternalComponent.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/components/ExternalComponent.java similarity index 84% rename from activemq-bootstrap/src/main/java/org/apache/activemq/components/ExternalComponent.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/components/ExternalComponent.java index ae5d387ebd..9317c1bcb2 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/components/ExternalComponent.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/components/ExternalComponent.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.components; +package org.apache.activemq.artemis.components; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.dto.ComponentDTO; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.dto.ComponentDTO; public interface ExternalComponent extends ActiveMQComponent { diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BasicSecurityHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BasicSecurityHandler.java similarity index 84% rename from activemq-bootstrap/src/main/java/org/apache/activemq/factory/BasicSecurityHandler.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BasicSecurityHandler.java index 8d480135f5..adb0850439 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BasicSecurityHandler.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BasicSecurityHandler.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.factory; +package org.apache.activemq.artemis.factory; import java.io.File; -import org.apache.activemq.core.config.impl.FileSecurityConfiguration; -import org.apache.activemq.dto.BasicSecurityDTO; -import org.apache.activemq.dto.SecurityDTO; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; +import org.apache.activemq.artemis.core.config.impl.FileSecurityConfiguration; +import org.apache.activemq.artemis.dto.BasicSecurityDTO; +import org.apache.activemq.artemis.dto.SecurityDTO; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl; public class BasicSecurityHandler implements SecurityHandler { diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactory.java similarity index 84% rename from activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactory.java index cfa52d8602..06ad977b4d 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.factory; +package org.apache.activemq.artemis.factory; -import org.apache.activemq.cli.ConfigurationException; -import org.apache.activemq.dto.BrokerDTO; -import org.apache.activemq.dto.ServerDTO; -import org.apache.activemq.integration.Broker; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.utils.FactoryFinder; +import org.apache.activemq.artemis.cli.ConfigurationException; +import org.apache.activemq.artemis.dto.BrokerDTO; +import org.apache.activemq.artemis.dto.ServerDTO; +import org.apache.activemq.artemis.integration.Broker; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.utils.FactoryFinder; import java.io.File; import java.io.IOException; @@ -40,7 +40,7 @@ public class BrokerFactory BrokerFactoryHandler factory = null; try { - FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/"); + FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/artemis/broker/"); factory = (BrokerFactoryHandler) finder.newInstance(configURI.getScheme()); } catch (IOException ioe) @@ -76,7 +76,7 @@ public class BrokerFactory try { - FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/server/"); + FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/artemis/broker/server/"); handler = (BrokerHandler) finder.newInstance(configURI.getScheme()); } catch (IOException ioe) diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactoryHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactoryHandler.java similarity index 90% rename from activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactoryHandler.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactoryHandler.java index 9880a2991b..5ac0d73a52 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactoryHandler.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerFactoryHandler.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.factory; +package org.apache.activemq.artemis.factory; -import org.apache.activemq.dto.BrokerDTO; +import org.apache.activemq.artemis.dto.BrokerDTO; import java.net.URI; diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerHandler.java similarity index 80% rename from activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerHandler.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerHandler.java index 0d56efa095..bd51f39717 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerHandler.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/BrokerHandler.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.factory; +package org.apache.activemq.artemis.factory; -import org.apache.activemq.dto.ServerDTO; -import org.apache.activemq.integration.Broker; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.dto.ServerDTO; +import org.apache.activemq.artemis.integration.Broker; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; public interface BrokerHandler { diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileBrokerHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/FileBrokerHandler.java similarity index 78% rename from activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileBrokerHandler.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/FileBrokerHandler.java index 1aef548af7..ce0590fb85 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileBrokerHandler.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/FileBrokerHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.factory; +package org.apache.activemq.artemis.factory; -import org.apache.activemq.dto.ServerDTO; -import org.apache.activemq.integration.Broker; -import org.apache.activemq.integration.FileBroker; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.dto.ServerDTO; +import org.apache.activemq.artemis.integration.Broker; +import org.apache.activemq.artemis.integration.FileBroker; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; public class FileBrokerHandler implements BrokerHandler { diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityHandler.java similarity index 84% rename from activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityHandler.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityHandler.java index 39a5e98abd..d157d7badd 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityHandler.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityHandler.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.factory; +package org.apache.activemq.artemis.factory; -import org.apache.activemq.dto.SecurityDTO; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.dto.SecurityDTO; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; public interface SecurityHandler { diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityManagerFactory.java similarity index 83% rename from activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityManagerFactory.java index 2c58007419..d7fd588ee2 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/SecurityManagerFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.factory; +package org.apache.activemq.artemis.factory; -import org.apache.activemq.dto.SecurityDTO; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.utils.FactoryFinder; +import org.apache.activemq.artemis.dto.SecurityDTO; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.utils.FactoryFinder; import javax.xml.bind.annotation.XmlRootElement; @@ -29,7 +29,7 @@ public class SecurityManagerFactory { if (config != null) { - FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/security/"); + FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/artemis/broker/security/"); SecurityHandler securityHandler = (SecurityHandler)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name()); return securityHandler.createSecurityManager(config); } diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/XmlBrokerFactoryHandler.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/XmlBrokerFactoryHandler.java similarity index 86% rename from activemq-bootstrap/src/main/java/org/apache/activemq/factory/XmlBrokerFactoryHandler.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/XmlBrokerFactoryHandler.java index 7ee00ce681..d600f7942a 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/XmlBrokerFactoryHandler.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/factory/XmlBrokerFactoryHandler.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.factory; +package org.apache.activemq.artemis.factory; -import org.apache.activemq.cli.ConfigurationException; -import org.apache.activemq.dto.BrokerDTO; -import org.apache.activemq.dto.XmlUtil; +import org.apache.activemq.artemis.cli.ConfigurationException; +import org.apache.activemq.artemis.dto.BrokerDTO; +import org.apache.activemq.artemis.dto.XmlUtil; import java.io.File; import java.net.URI; diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/Broker.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/Broker.java similarity index 89% rename from activemq-bootstrap/src/main/java/org/apache/activemq/integration/Broker.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/Broker.java index 8ba2f32285..8fb5794db8 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/Broker.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/Broker.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration; +package org.apache.activemq.artemis.integration; -import org.apache.activemq.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; /** * A Broker os a set of ActiveMQComponents that create a Server, for instance core and jms. diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/FileBroker.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java similarity index 86% rename from activemq-bootstrap/src/main/java/org/apache/activemq/integration/FileBroker.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java index 98e4d922c6..4bf2df26f8 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/FileBroker.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration; +package org.apache.activemq.artemis.integration; -import org.apache.activemq.core.config.FileDeploymentManager; -import org.apache.activemq.core.config.impl.FileConfiguration; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.dto.ServerDTO; -import org.apache.activemq.integration.bootstrap.ActiveMQBootstrapLogger; -import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.core.config.FileDeploymentManager; +import org.apache.activemq.artemis.core.config.impl.FileConfiguration; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.dto.ServerDTO; +import org.apache.activemq.artemis.integration.bootstrap.ActiveMQBootstrapLogger; +import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; import java.lang.management.ManagementFactory; import java.util.ArrayList; diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapBundle.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapBundle.java similarity index 94% rename from activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapBundle.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapBundle.java index f7d4900e7d..4254e8a405 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapBundle.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapBundle.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.bootstrap; +package org.apache.activemq.artemis.integration.bootstrap; import org.jboss.logging.annotations.MessageBundle; diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapLogger.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java similarity index 97% rename from activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapLogger.java rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java index 8fcfd7feb9..c1bea17cd5 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/ActiveMQBootstrapLogger.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.integration.bootstrap; +package org.apache.activemq.artemis.integration.bootstrap; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/security/basic-security b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/security/basic-security similarity index 91% rename from activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/security/basic-security rename to artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/security/basic-security index b262a51855..8418fe9639 100644 --- a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/security/basic-security +++ b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/security/basic-security @@ -2,16 +2,16 @@ ## Licensed to the Apache Software Foundation (ASF) under one or more ## contributor license agreements. See the NOTICE file distributed with ## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 +## The ASF licenses this file to You under the Apache License, Version 2.0 ## (the "License"); you may not use this file except in compliance with ## the License. You may obtain a copy of the License at -## +## ## http://www.apache.org/licenses/LICENSE-2.0 ## ## Unless required by applicable law or agreed to in writing, software ## distributed under the License is distributed on an "AS IS" BASIS, ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and +## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- -class=org.apache.activemq.factory.BasicSecurityHandler +class=org.apache.activemq.artemis.factory.BasicSecurityHandler diff --git a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/server/file b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/server/file similarity index 91% rename from activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/server/file rename to artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/server/file index e3cf2b1fd2..26ec4fbb50 100644 --- a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/server/file +++ b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/server/file @@ -2,16 +2,16 @@ ## Licensed to the Apache Software Foundation (ASF) under one or more ## contributor license agreements. See the NOTICE file distributed with ## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 +## The ASF licenses this file to You under the Apache License, Version 2.0 ## (the "License"); you may not use this file except in compliance with ## the License. You may obtain a copy of the License at -## +## ## http://www.apache.org/licenses/LICENSE-2.0 ## ## Unless required by applicable law or agreed to in writing, software ## distributed under the License is distributed on an "AS IS" BASIS, ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and +## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- -class=org.apache.activemq.factory.FileBrokerHandler +class=org.apache.activemq.artemis.factory.FileBrokerHandler diff --git a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/xml b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/xml similarity index 91% rename from activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/xml rename to artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/xml index ce85c223b3..28251eface 100644 --- a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/xml +++ b/artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis/broker/xml @@ -2,16 +2,16 @@ ## Licensed to the Apache Software Foundation (ASF) under one or more ## contributor license agreements. See the NOTICE file distributed with ## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 +## The ASF licenses this file to You under the Apache License, Version 2.0 ## (the "License"); you may not use this file except in compliance with ## the License. You may obtain a copy of the License at -## +## ## http://www.apache.org/licenses/LICENSE-2.0 ## ## Unless required by applicable law or agreed to in writing, software ## distributed under the License is distributed on an "AS IS" BASIS, ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and +## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- -class=org.apache.activemq.factory.XmlBrokerFactoryHandler +class=org.apache.activemq.artemis.factory.XmlBrokerFactoryHandler diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/bin/activemq b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq similarity index 97% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/bin/activemq rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq index bca157bd3a..c72af5b41b 100755 --- a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/bin/activemq +++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -53,7 +53,7 @@ JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -X # Load Profile Data . "$ACTIVEMQ_INSTANCE/etc/activemq.profile" -CLASSPATH="$ACTIVEMQ_HOME/lib/activemq-boot.jar" +CLASSPATH="$ACTIVEMQ_HOME/lib/artemis-boot.jar" # OS specific support. cygwin=false; @@ -116,4 +116,4 @@ exec "$JAVACMD" $JAVA_ARGS $ACTIVEMQ_CLUSTER_PROPS \ -Djava.util.logging.manager="$ACTIVEMQ_LOG_MANAGER" \ -Dlogging.configuration="$ACTIVEMQ_LOGGING_CONF" \ $DEBUG_ARGS \ - org.apache.activemq.boot.ActiveMQ $@ + org.apache.activemq.artemis.boot.ActiveMQ $@ diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/bin/activemq-service b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service similarity index 100% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/bin/activemq-service rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/bin/activemq-service.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml similarity index 91% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/bin/activemq-service.xml rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml index fa815aae66..1a95c6842d 100644 --- a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/bin/activemq-service.xml +++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml @@ -20,7 +20,7 @@ activemq-${host} ActiveMQ: ${host} - Apache ActiveMQ is a reliable messaging broker + Apache ActiveMQ Artemis is a reliable messaging broker ${activemq.instance}\log roll @@ -40,7 +40,7 @@ --> -classpath - "${activemq.home}\lib\activemq-boot.jar" + "${activemq.home}\lib\artemis-boot.jar" "-Dactivemq.home=${activemq.home}" "-Dactivemq.instance=${activemq.instance}" "-Ddata.dir=${activemq.instance}/data" @@ -52,7 +52,7 @@ -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 --> - org.apache.activemq.boot.ActiveMQ + ActiveMQ run diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/bin/activemq.cmd b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd similarity index 94% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/bin/activemq.cmd rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd index 357b44de22..fd56f09ae4 100755 --- a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/bin/activemq.cmd +++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd @@ -6,9 +6,9 @@ rem regarding copyright ownership. The ASF licenses this file rem to you under the Apache License, Version 2.0 (the rem "License"); you may not use this file except in compliance rem with the License. You may obtain a copy of the License at -rem +rem rem http://www.apache.org/licenses/LICENSE-2.0 -rem +rem rem Unless required by applicable law or agreed to in writing, rem software distributed under the License is distributed on an rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -59,7 +59,7 @@ call "%ACTIVEMQ_INSTANCE%\etc\activemq.profile.cmd" %* rem "Create full JVM Args" set JVM_ARGS=%JAVA_ARGS% if not "%ACTIVEMQ_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ACTIVEMQ_CLUSTER_PROPS% -set JVM_ARGS=%JVM_ARGS% -classpath "%ACTIVEMQ_HOME%\lib\activemq-boot.jar" +set JVM_ARGS=%JVM_ARGS% -classpath "%ACTIVEMQ_HOME%\lib\artemis-boot.jar" set JVM_ARGS=%JVM_ARGS% -Dactivemq.home="%ACTIVEMQ_HOME%" set JVM_ARGS=%JVM_ARGS% -Dactivemq.instance="%ACTIVEMQ_INSTANCE%" set JVM_ARGS=%JVM_ARGS% -Ddata.dir="%ACTIVEMQ_DATA_DIR%" @@ -67,7 +67,7 @@ set JVM_ARGS=%JVM_ARGS% -Djava.util.logging.manager="%ACTIVEMQ_LOG_MANAGER%" set JVM_ARGS=%JVM_ARGS% -Dlogging.configuration="%ACTIVEMQ_LOGGING_CONF%" if not "%DEBUG_ARGS%"=="" set JVM_ARGS=%JVM_ARGS% %DEBUG_ARGS% -"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.boot.ActiveMQ %* +"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.ActiveMQ %* :END endlocal diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/activemq-configuration.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-configuration.xml similarity index 100% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/activemq-configuration.xml rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-configuration.xml diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/activemq-roles.properties b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-roles.properties similarity index 100% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/activemq-roles.properties rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-roles.properties diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/activemq-users.properties b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-users.properties similarity index 100% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/activemq-users.properties rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-users.properties diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/activemq.profile b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile similarity index 100% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/activemq.profile rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/activemq.profile.cmd b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd similarity index 100% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/activemq.profile.cmd rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/bootstrap.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml similarity index 100% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/bootstrap.xml rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/cluster-settings.txt b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt similarity index 100% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/cluster-settings.txt rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/logging.properties b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties similarity index 76% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/logging.properties rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties index 066ac9c7a5..f4f4a814d7 100644 --- a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/logging.properties +++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties @@ -17,16 +17,16 @@ # Additional logger names to configure (root logger is always configured) # Root logger option -loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.utils,org.apache.activemq.journal,org.apache.activemq.jms.server,org.apache.activemq.integration.bootstrap +loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms.server,org.apache.activemq.artemis.integration.bootstrap # Root logger level logger.level=INFO # ActiveMQ logger levels -logger.org.apache.activemq.core.server.level=INFO -logger.org.apache.activemq.journal.level=INFO -logger.org.apache.activemq.utils.level=INFO -logger.org.apache.activemq.jms.level=INFO -logger.org.apache.activemq.integration.bootstrap.level=INFO +logger.org.apache.activemq.artemis.core.server.level=INFO +logger.org.apache.activemq.artemis.journal.level=INFO +logger.org.apache.activemq.artemis.utils.level=INFO +logger.org.apache.activemq.artemis.jms.level=INFO +logger.org.apache.activemq.artemis.integration.bootstrap.level=INFO # Root logger handlers logger.handlers=FILE,CONSOLE diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/replicated-settings.txt b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/replicated-settings.txt similarity index 100% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/replicated-settings.txt rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/replicated-settings.txt diff --git a/activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/shared-store-settings.txt b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/shared-store-settings.txt similarity index 100% rename from activemq-bootstrap/src/main/resources/org/apache/activemq/cli/commands/etc/shared-store-settings.txt rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/shared-store-settings.txt diff --git a/activemq-bootstrap/src/test/java/org/apache/activemq/test/FileBrokerTest.java b/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java similarity index 87% rename from activemq-bootstrap/src/test/java/org/apache/activemq/test/FileBrokerTest.java rename to artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java index 92eb4ce9da..a177d65dca 100644 --- a/activemq-bootstrap/src/test/java/org/apache/activemq/test/FileBrokerTest.java +++ b/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.test; +package org.apache.activemq.artemis.test; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.dto.ServerDTO; -import org.apache.activemq.integration.FileBroker; -import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.dto.ServerDTO; +import org.apache.activemq.artemis.integration.FileBroker; +import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl; import org.junit.Assert; import org.junit.Test; diff --git a/activemq-bootstrap/src/test/resources/activemq-configuration-nojms.xml b/artemis-bootstrap/src/test/resources/activemq-configuration-nojms.xml similarity index 100% rename from activemq-bootstrap/src/test/resources/activemq-configuration-nojms.xml rename to artemis-bootstrap/src/test/resources/activemq-configuration-nojms.xml diff --git a/activemq-bootstrap/src/test/resources/activemq-configuration.xml b/artemis-bootstrap/src/test/resources/activemq-configuration.xml similarity index 100% rename from activemq-bootstrap/src/test/resources/activemq-configuration.xml rename to artemis-bootstrap/src/test/resources/activemq-configuration.xml diff --git a/activemq-commons/pom.xml b/artemis-commons/pom.xml similarity index 94% rename from activemq-commons/pom.xml rename to artemis-commons/pom.xml index 84bbf0e239..9bd669cbdb 100644 --- a/activemq-commons/pom.xml +++ b/artemis-commons/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-commons + artemis-commons jar ActiveMQ Artemis Commons diff --git a/activemq-commons/src/main/appended-resources/META-INF/LICENSE b/artemis-commons/src/main/appended-resources/META-INF/LICENSE similarity index 100% rename from activemq-commons/src/main/appended-resources/META-INF/LICENSE rename to artemis-commons/src/main/appended-resources/META-INF/LICENSE diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQAddressExistsException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressExistsException.java similarity index 86% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQAddressExistsException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressExistsException.java index 5cdf9705e4..670219baaf 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQAddressExistsException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressExistsException.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.ADDRESS_EXISTS; +package org.apache.activemq.artemis.api.core; /** * An operation failed because an address exists on the server. @@ -27,11 +25,11 @@ public final class ActiveMQAddressExistsException extends ActiveMQException public ActiveMQAddressExistsException() { - super(ADDRESS_EXISTS); + super(ActiveMQExceptionType.ADDRESS_EXISTS); } public ActiveMQAddressExistsException(String msg) { - super(ADDRESS_EXISTS, msg); + super(ActiveMQExceptionType.ADDRESS_EXISTS, msg); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQAddressFullException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressFullException.java similarity index 85% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQAddressFullException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressFullException.java index ea5a528ca9..f1ae2b5e68 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQAddressFullException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAddressFullException.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.ADDRESS_FULL; +package org.apache.activemq.artemis.api.core; /** * An address is full. @@ -27,11 +25,11 @@ public final class ActiveMQAddressFullException extends ActiveMQException public ActiveMQAddressFullException(String message) { - super(ADDRESS_FULL, message); + super(ActiveMQExceptionType.ADDRESS_FULL, message); } public ActiveMQAddressFullException() { - super(ADDRESS_FULL); + super(ActiveMQExceptionType.ADDRESS_FULL); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQAlreadyReplicatingException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAlreadyReplicatingException.java similarity index 85% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQAlreadyReplicatingException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAlreadyReplicatingException.java index 8c8e1e8012..6bd9629a64 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQAlreadyReplicatingException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQAlreadyReplicatingException.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.ALREADY_REPLICATING; +package org.apache.activemq.artemis.api.core; /** * The server is already paired with a replicating backup. @@ -27,11 +25,11 @@ public final class ActiveMQAlreadyReplicatingException extends ActiveMQException public ActiveMQAlreadyReplicatingException() { - super(ALREADY_REPLICATING); + super(ActiveMQExceptionType.ALREADY_REPLICATING); } public ActiveMQAlreadyReplicatingException(String msg) { - super(ALREADY_REPLICATING, msg); + super(ActiveMQExceptionType.ALREADY_REPLICATING, msg); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQBuffer.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java similarity index 99% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQBuffer.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java index 62c38f1d2b..dcdc0b25bc 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQBuffer.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.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.nio.ByteBuffer; diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQBuffers.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java similarity index 96% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQBuffers.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java index d6402cdfed..294ff9af58 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQBuffers.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.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.nio.ByteBuffer; import io.netty.buffer.Unpooled; -import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper; /** * Factory class to create instances of {@link ActiveMQBuffer}. diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQClusterSecurityException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQClusterSecurityException.java similarity index 96% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQClusterSecurityException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQClusterSecurityException.java index e18e0263e3..caa82122c6 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQClusterSecurityException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQClusterSecurityException.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; /** * Security exception thrown when the cluster user fails authentication. diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQConnectionTimedOutException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java similarity index 85% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQConnectionTimedOutException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java index 86c0bff706..2061e9c2fd 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQConnectionTimedOutException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.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.CONNECTION_TIMEDOUT; +package org.apache.activemq.artemis.api.core; /** * A client timed out will connecting to ActiveMQ server. @@ -27,11 +25,11 @@ public final class ActiveMQConnectionTimedOutException extends ActiveMQException public ActiveMQConnectionTimedOutException() { - super(CONNECTION_TIMEDOUT); + super(ActiveMQExceptionType.CONNECTION_TIMEDOUT); } public ActiveMQConnectionTimedOutException(String msg) { - super(CONNECTION_TIMEDOUT, msg); + super(ActiveMQExceptionType.CONNECTION_TIMEDOUT, msg); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQDisconnectedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java similarity index 86% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQDisconnectedException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java index 3809b74fb0..663269a260 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQDisconnectedException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.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.DISCONNECTED; +package org.apache.activemq.artemis.api.core; /** * A client was disconnected from ActiveMQ server when the server has shut down. @@ -27,11 +25,11 @@ public final class ActiveMQDisconnectedException extends ActiveMQException public ActiveMQDisconnectedException() { - super(DISCONNECTED); + super(ActiveMQExceptionType.DISCONNECTED); } public ActiveMQDisconnectedException(String message) { - super(DISCONNECTED, message); + super(ActiveMQExceptionType.DISCONNECTED, message); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQDuplicateIdException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateIdException.java similarity index 84% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQDuplicateIdException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateIdException.java index 649d2f43b2..674917bd03 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQDuplicateIdException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateIdException.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.DUPLICATE_ID_REJECTED; +package org.apache.activemq.artemis.api.core; /** * A DuplicateID was rejected. @@ -27,11 +25,11 @@ public final class ActiveMQDuplicateIdException extends ActiveMQException public ActiveMQDuplicateIdException() { - super(DUPLICATE_ID_REJECTED); + super(ActiveMQExceptionType.DUPLICATE_ID_REJECTED); } public ActiveMQDuplicateIdException(String message) { - super(DUPLICATE_ID_REJECTED, message); + super(ActiveMQExceptionType.DUPLICATE_ID_REJECTED, message); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQDuplicateMetaDataException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateMetaDataException.java similarity index 85% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQDuplicateMetaDataException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateMetaDataException.java index 6427fae97c..9f4961c0f5 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQDuplicateMetaDataException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDuplicateMetaDataException.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.DUPLICATE_METADATA; +package org.apache.activemq.artemis.api.core; /** * A Session Metadata was set in duplication @@ -27,11 +25,11 @@ public final class ActiveMQDuplicateMetaDataException extends ActiveMQException public ActiveMQDuplicateMetaDataException() { - super(DUPLICATE_METADATA); + super(ActiveMQExceptionType.DUPLICATE_METADATA); } public ActiveMQDuplicateMetaDataException(String msg) { - super(DUPLICATE_METADATA, msg); + super(ActiveMQExceptionType.DUPLICATE_METADATA, msg); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java similarity index 97% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java index df01deec6f..f8a09e92e1 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.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; /** * ActiveMQException is the root exception for the ActiveMQ API. diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQExceptionType.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java similarity index 99% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQExceptionType.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java index 2df95d44b6..8c95a42e98 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQExceptionType.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.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.Collections; import java.util.EnumSet; diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQIOErrorException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIOErrorException.java similarity index 85% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQIOErrorException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIOErrorException.java index 30fab771af..1c292d833f 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQIOErrorException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIOErrorException.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.IO_ERROR; +package org.apache.activemq.artemis.api.core; /** * Unexpected I/O error occurred on the server. @@ -27,16 +25,16 @@ public final class ActiveMQIOErrorException extends ActiveMQException public ActiveMQIOErrorException() { - super(IO_ERROR); + super(ActiveMQExceptionType.IO_ERROR); } public ActiveMQIOErrorException(String msg) { - super(IO_ERROR, msg); + super(ActiveMQExceptionType.IO_ERROR, msg); } public ActiveMQIOErrorException(String msg, Throwable cause) { - super(IO_ERROR, msg, cause); + super(ActiveMQExceptionType.IO_ERROR, msg, cause); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQIllegalStateException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java similarity index 86% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQIllegalStateException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java index 2c32f4dc54..1bf4185e29 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQIllegalStateException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.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.ILLEGAL_STATE; +package org.apache.activemq.artemis.api.core; /** * A ActiveMQ resource is not in a legal state (e.g. calling ClientConsumer.receive() if a @@ -28,11 +26,11 @@ public final class ActiveMQIllegalStateException extends ActiveMQException public ActiveMQIllegalStateException() { - super(ILLEGAL_STATE); + super(ActiveMQExceptionType.ILLEGAL_STATE); } public ActiveMQIllegalStateException(String message) { - super(ILLEGAL_STATE, message); + super(ActiveMQExceptionType.ILLEGAL_STATE, message); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQIncompatibleClientServerException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIncompatibleClientServerException.java similarity index 83% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQIncompatibleClientServerException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIncompatibleClientServerException.java index ca9163e203..7d71f5d733 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQIncompatibleClientServerException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIncompatibleClientServerException.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.INCOMPATIBLE_CLIENT_SERVER_VERSIONS; +package org.apache.activemq.artemis.api.core; /** * The server version and the client version are incompatible. @@ -29,11 +27,11 @@ public final class ActiveMQIncompatibleClientServerException extends ActiveMQExc public ActiveMQIncompatibleClientServerException() { - super(INCOMPATIBLE_CLIENT_SERVER_VERSIONS); + super(ActiveMQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS); } public ActiveMQIncompatibleClientServerException(String msg) { - super(INCOMPATIBLE_CLIENT_SERVER_VERSIONS, msg); + super(ActiveMQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS, msg); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInterceptorRejectedPacketException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterceptorRejectedPacketException.java similarity index 78% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInterceptorRejectedPacketException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterceptorRejectedPacketException.java index 9c26b87c50..4705ffd3d9 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInterceptorRejectedPacketException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterceptorRejectedPacketException.java @@ -14,13 +14,11 @@ * 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.INTERCEPTOR_REJECTED_PACKET; +package org.apache.activemq.artemis.api.core; /** * An outgoing interceptor returned false. - * See org.apache.activemq.api.core.client.ServerLocator#addOutgoingInterceptor(org.apache.activemq.api.core.Interceptor) + * See org.apache.activemq.artemis.api.core.client.ServerLocator#addOutgoingInterceptor(org.apache.activemq.artemis.api.core.Interceptor) */ // XXX I doubt any reader will make much sense of this Javadoc's text. public final class ActiveMQInterceptorRejectedPacketException extends ActiveMQException @@ -29,11 +27,11 @@ public final class ActiveMQInterceptorRejectedPacketException extends ActiveMQEx public ActiveMQInterceptorRejectedPacketException() { - super(INTERCEPTOR_REJECTED_PACKET); + super(ActiveMQExceptionType.INTERCEPTOR_REJECTED_PACKET); } public ActiveMQInterceptorRejectedPacketException(String msg) { - super(INTERCEPTOR_REJECTED_PACKET, msg); + super(ActiveMQExceptionType.INTERCEPTOR_REJECTED_PACKET, msg); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInternalErrorException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java similarity index 82% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInternalErrorException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java index 692b428a2d..f1934d65ed 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInternalErrorException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.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.INTERNAL_ERROR; +package org.apache.activemq.artemis.api.core; /** * Internal error which prevented ActiveMQ from performing an important operation. @@ -27,21 +25,21 @@ public final class ActiveMQInternalErrorException extends ActiveMQException public ActiveMQInternalErrorException() { - super(INTERNAL_ERROR); + super(ActiveMQExceptionType.INTERNAL_ERROR); } public ActiveMQInternalErrorException(String msg) { - super(INTERNAL_ERROR, msg); + super(ActiveMQExceptionType.INTERNAL_ERROR, msg); } public ActiveMQInternalErrorException(String message, Exception e) { - super(INTERNAL_ERROR, message, e); + super(ActiveMQExceptionType.INTERNAL_ERROR, message, e); } public ActiveMQInternalErrorException(String message, Throwable t) { - super(INTERNAL_ERROR, message, t); + super(ActiveMQExceptionType.INTERNAL_ERROR, message, t); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInterruptedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterruptedException.java similarity index 96% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInterruptedException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterruptedException.java index d20fe1c374..8fd5c14dcd 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInterruptedException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInterruptedException.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; /** * When an interruption happens, we will just throw a non-checked exception. diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInvalidFilterExpressionException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidFilterExpressionException.java similarity index 84% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInvalidFilterExpressionException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidFilterExpressionException.java index 290cfabe66..be4cb7b6cb 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInvalidFilterExpressionException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidFilterExpressionException.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.INVALID_FILTER_EXPRESSION; +package org.apache.activemq.artemis.api.core; /** * A filter expression was found to be invalid. @@ -27,11 +25,11 @@ public final class ActiveMQInvalidFilterExpressionException extends ActiveMQExce public ActiveMQInvalidFilterExpressionException() { - super(INVALID_FILTER_EXPRESSION); + super(ActiveMQExceptionType.INVALID_FILTER_EXPRESSION); } public ActiveMQInvalidFilterExpressionException(String msg) { - super(INVALID_FILTER_EXPRESSION, msg); + super(ActiveMQExceptionType.INVALID_FILTER_EXPRESSION, msg); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInvalidTransientQueueUseException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidTransientQueueUseException.java similarity index 84% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInvalidTransientQueueUseException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidTransientQueueUseException.java index b66de62b73..278b399168 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQInvalidTransientQueueUseException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInvalidTransientQueueUseException.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.INVALID_TRANSIENT_QUEUE_USE; +package org.apache.activemq.artemis.api.core; /** * An operation failed because a queue exists on the server. @@ -27,11 +25,11 @@ public final class ActiveMQInvalidTransientQueueUseException extends ActiveMQExc public ActiveMQInvalidTransientQueueUseException() { - super(INVALID_TRANSIENT_QUEUE_USE); + super(ActiveMQExceptionType.INVALID_TRANSIENT_QUEUE_USE); } public ActiveMQInvalidTransientQueueUseException(String msg) { - super(INVALID_TRANSIENT_QUEUE_USE, msg); + super(ActiveMQExceptionType.INVALID_TRANSIENT_QUEUE_USE, msg); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQLargeMessageException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageException.java similarity index 84% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQLargeMessageException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageException.java index 6b73904107..0378e0005c 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQLargeMessageException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageException.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.LARGE_MESSAGE_ERROR_BODY; +package org.apache.activemq.artemis.api.core; /** * A problem occurred while manipulating the body of a large message. @@ -27,11 +25,11 @@ public final class ActiveMQLargeMessageException extends ActiveMQException public ActiveMQLargeMessageException() { - super(LARGE_MESSAGE_ERROR_BODY); + super(ActiveMQExceptionType.LARGE_MESSAGE_ERROR_BODY); } public ActiveMQLargeMessageException(String msg) { - super(LARGE_MESSAGE_ERROR_BODY, msg); + super(ActiveMQExceptionType.LARGE_MESSAGE_ERROR_BODY, msg); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQLargeMessageInterruptedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageInterruptedException.java similarity index 83% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQLargeMessageInterruptedException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageInterruptedException.java index cfe8786948..ad75c21b78 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQLargeMessageInterruptedException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQLargeMessageInterruptedException.java @@ -14,11 +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.LARGE_MESSAGE_INTERRUPTED; - /** */ // XXX @@ -28,11 +26,11 @@ public class ActiveMQLargeMessageInterruptedException extends ActiveMQException public ActiveMQLargeMessageInterruptedException(String message) { - super(LARGE_MESSAGE_INTERRUPTED, message); + super(ActiveMQExceptionType.LARGE_MESSAGE_INTERRUPTED, message); } public ActiveMQLargeMessageInterruptedException() { - super(LARGE_MESSAGE_INTERRUPTED); + super(ActiveMQExceptionType.LARGE_MESSAGE_INTERRUPTED); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQNativeIOError.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java similarity index 96% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQNativeIOError.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java index 7df1502750..be48fe4b20 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQNativeIOError.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.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; /** diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQNonExistentQueueException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNonExistentQueueException.java similarity index 85% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQNonExistentQueueException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNonExistentQueueException.java index 2bb0bb7b2c..8e1b70cf17 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQNonExistentQueueException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNonExistentQueueException.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_DOES_NOT_EXIST; +package org.apache.activemq.artemis.api.core; /** * An operation failed because a queue does not exist on the server. @@ -27,11 +25,11 @@ public final class ActiveMQNonExistentQueueException extends ActiveMQException public ActiveMQNonExistentQueueException() { - super(QUEUE_DOES_NOT_EXIST); + super(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST); } public ActiveMQNonExistentQueueException(String msg) { - super(QUEUE_DOES_NOT_EXIST, msg); + super(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, msg); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQNotConnectedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java similarity index 86% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQNotConnectedException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java index 3768ae66f4..2878d69c72 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQNotConnectedException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.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.NOT_CONNECTED; +package org.apache.activemq.artemis.api.core; /** * A client is not able to connect to ActiveMQ server. @@ -27,11 +25,11 @@ public final class ActiveMQNotConnectedException extends ActiveMQException public ActiveMQNotConnectedException(String message) { - super(NOT_CONNECTED, message); + super(ActiveMQExceptionType.NOT_CONNECTED, message); } public ActiveMQNotConnectedException() { - super(NOT_CONNECTED); + super(ActiveMQExceptionType.NOT_CONNECTED); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQObjectClosedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQObjectClosedException.java similarity index 86% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQObjectClosedException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQObjectClosedException.java index 155fde7df8..76c0a814e3 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQObjectClosedException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQObjectClosedException.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.OBJECT_CLOSED; +package org.apache.activemq.artemis.api.core; /** * A client operation failed because the calling resource (ClientSession, ClientProducer, etc.) is @@ -28,11 +26,11 @@ public final class ActiveMQObjectClosedException extends ActiveMQException public ActiveMQObjectClosedException() { - super(OBJECT_CLOSED); + super(ActiveMQExceptionType.OBJECT_CLOSED); } public ActiveMQObjectClosedException(String msg) { - super(OBJECT_CLOSED, msg); + super(ActiveMQExceptionType.OBJECT_CLOSED, msg); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQPropertyConversionException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQPropertyConversionException.java similarity index 92% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQPropertyConversionException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQPropertyConversionException.java index 84ce12e2bd..34373474b3 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQQueueExistsException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueExistsException.java similarity index 86% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQQueueExistsException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueExistsException.java index 4c2512857a..a6d65dbaed 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQSecurityException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSecurityException.java similarity index 89% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQSecurityException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSecurityException.java index 47a238308a..140d0c4a5f 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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,...) diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQSessionCreationException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSessionCreationException.java similarity index 84% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQSessionCreationException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQSessionCreationException.java index 30cad1bd38..fd52530904 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQTransactionOutcomeUnknownException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionOutcomeUnknownException.java similarity index 83% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQTransactionOutcomeUnknownException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionOutcomeUnknownException.java index 09d5923b48..f5892933be 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQTransactionRolledBackException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionRolledBackException.java similarity index 84% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQTransactionRolledBackException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionRolledBackException.java index f3a9e80e15..7d777e2c17 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQUnBlockedException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnBlockedException.java similarity index 87% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQUnBlockedException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnBlockedException.java index 4fdce56cde..aab25fd5b3 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQUnsupportedPacketException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java similarity index 85% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/ActiveMQUnsupportedPacketException.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java index c513134f58..d8b6aa98e2 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/Pair.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/Pair.java similarity index 97% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/Pair.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/Pair.java index 098643c049..784cae1ea1 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/SimpleString.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java similarity index 99% rename from activemq-commons/src/main/java/org/apache/activemq/api/core/SimpleString.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java index eb3d16df28..3defc73b2f 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 diff --git a/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java similarity index 97% rename from activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ChannelBufferWrapper.java index 50c19d1be3..d742f3529c 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 { diff --git a/activemq-commons/src/main/java/org/apache/activemq/core/server/ActiveMQComponent.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQComponent.java similarity index 95% rename from activemq-commons/src/main/java/org/apache/activemq/core/server/ActiveMQComponent.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQComponent.java index 0df80f55ea..e4466a5ef2 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 { diff --git a/activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilBundle.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java similarity index 94% rename from activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilBundle.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java index be1abe56e6..6be2ae42ba 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilLogger.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java similarity index 97% rename from activemq-commons/src/main/java/org/apache/activemq/logs/ActiveMQUtilLogger.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java index 00153a5c32..81e1b31910 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/logs/AssertionLoggerHandler.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java similarity index 98% rename from activemq-commons/src/main/java/org/apache/activemq/logs/AssertionLoggerHandler.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java index e7dd076784..15663174da 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ActiveMQThreadFactory.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java similarity index 98% rename from activemq-commons/src/main/java/org/apache/activemq/utils/ActiveMQThreadFactory.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ActiveMQThreadFactory.java index 23a84dbeab..193ee6f621 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/Base64.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java similarity index 99% rename from activemq-commons/src/main/java/org/apache/activemq/utils/Base64.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java index 2fb362b95a..9d2481a371 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ByteUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java similarity index 98% rename from activemq-commons/src/main/java/org/apache/activemq/utils/ByteUtil.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java index b09de3ae26..4130c36662 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ClassloadingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java similarity index 98% rename from activemq-commons/src/main/java/org/apache/activemq/utils/ClassloadingUtil.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java index 7b5abde90f..e5cd95426b 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentHashSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java similarity index 98% rename from activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentHashSet.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentHashSet.java index 0bd93a70c6..a5f19b4833 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentSet.java similarity index 95% rename from activemq-commons/src/main/java/org/apache/activemq/utils/ConcurrentSet.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ConcurrentSet.java index 6c5c533a94..1d038cc9cc 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/DataConstants.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DataConstants.java similarity index 97% rename from activemq-commons/src/main/java/org/apache/activemq/utils/DataConstants.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DataConstants.java index 8e659bb973..a15c5429fd 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 { diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/DefaultSensitiveStringCodec.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java similarity index 97% rename from activemq-commons/src/main/java/org/apache/activemq/utils/DefaultSensitiveStringCodec.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java index fa0884fc3d..508d5a4daf 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 { if (args.length != 1) { - System.err.println("Use: java -cp org.apache.activemq.utils.DefaultSensitiveStringCodec password-to-encode"); + System.err.println("Use: java -cp org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec password-to-encode"); System.err.println("Error: no password on the args"); System.exit(-1); } diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/FactoryFinder.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java similarity index 99% rename from activemq-commons/src/main/java/org/apache/activemq/utils/FactoryFinder.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java index 89f4b1e5b0..b85bf66fb1 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java similarity index 92% rename from activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java index 271c8d4e76..937cc1f580 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 { diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounter.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounter.java similarity index 95% rename from activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounter.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounter.java index 9c546ffd29..0b0cf0234a 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 { diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounterUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java similarity index 97% rename from activemq-commons/src/main/java/org/apache/activemq/utils/ReferenceCounterUtil.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReferenceCounterUtil.java index e42ab2c6b2..d47cc4d7b6 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/ReusableLatch.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java similarity index 99% rename from activemq-commons/src/main/java/org/apache/activemq/utils/ReusableLatch.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java index 22c0938131..117386a641 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/SensitiveDataCodec.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java similarity index 96% rename from activemq-commons/src/main/java/org/apache/activemq/utils/SensitiveDataCodec.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SensitiveDataCodec.java index 15da19121b..4f16a28f63 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java similarity index 96% rename from activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TypedProperties.java index 098c5c5d60..20b23b5cab 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 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.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 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. diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java similarity index 97% rename from activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java index fe6ea6193d..4b1811b217 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/UUID.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java similarity index 99% rename from activemq-commons/src/main/java/org/apache/activemq/utils/UUID.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java index 73bd15849d..3de4642443 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; /** diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java similarity index 98% rename from activemq-commons/src/main/java/org/apache/activemq/utils/UUIDGenerator.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java index cfcaa55add..b44731205a 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 { diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/UUIDTimer.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java similarity index 99% rename from activemq-commons/src/main/java/org/apache/activemq/utils/UUIDTimer.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java index a404bb6440..0c28078889 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/uri/SchemaConstants.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/SchemaConstants.java similarity index 95% rename from activemq-commons/src/main/java/org/apache/activemq/utils/uri/SchemaConstants.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/SchemaConstants.java index 04a8f69eba..53c2378b3a 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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 { diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URIFactory.java similarity index 98% rename from activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URIFactory.java index 7191cb6fc6..96c206910a 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URISchema.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java similarity index 99% rename from activemq-commons/src/main/java/org/apache/activemq/utils/uri/URISchema.java rename to artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISchema.java index 5ab7fe0af4..61595188bd 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/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; diff --git a/activemq-commons/src/test/java/org/apache/activemq/utils/ByteUtilTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java similarity index 97% rename from activemq-commons/src/test/java/org/apache/activemq/utils/ByteUtilTest.java rename to artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java index cf533d58c6..5a7096c496 100644 --- a/activemq-commons/src/test/java/org/apache/activemq/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; diff --git a/activemq-commons/src/test/java/org/apache/activemq/utils/PairTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java similarity index 92% rename from activemq-commons/src/test/java/org/apache/activemq/utils/PairTest.java rename to artemis-commons/src/test/java/org/apache/activemq/artemis/utils/PairTest.java index c5eb34a8ba..8915c8cfcb 100644 --- a/activemq-commons/src/test/java/org/apache/activemq/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 diff --git a/activemq-commons/src/test/java/org/apache/activemq/utils/ReferenceCounterTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java similarity index 98% rename from activemq-commons/src/test/java/org/apache/activemq/utils/ReferenceCounterTest.java rename to artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ReferenceCounterTest.java index 2da9a71ab8..92730e213e 100644 --- a/activemq-commons/src/test/java/org/apache/activemq/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; diff --git a/activemq-commons/src/test/java/org/apache/activemq/utils/URIParserTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/URIParserTest.java similarity index 97% rename from activemq-commons/src/test/java/org/apache/activemq/utils/URIParserTest.java rename to artemis-commons/src/test/java/org/apache/activemq/artemis/utils/URIParserTest.java index 7ef54980a8..c89f5e90d9 100644 --- a/activemq-commons/src/test/java/org/apache/activemq/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; diff --git a/activemq-core-client/pom.xml b/artemis-core-client/pom.xml similarity index 90% rename from activemq-core-client/pom.xml rename to artemis-core-client/pom.xml index 5f17cee2e2..4a6a62b4d4 100644 --- a/activemq-core-client/pom.xml +++ b/artemis-core-client/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-core-client + artemis-core-client jar ActiveMQ Artemis Core Client @@ -44,17 +44,17 @@ org.apache.activemq - activemq-commons + artemis-commons ${project.version} org.apache.activemq - activemq-selector + artemis-selector ${project.version} org.apache.activemq - activemq-journal + artemis-journal ${project.version} @@ -84,7 +84,7 @@ 512m false true - org.apache.activemq.core:org.apache.activemq.utils + org.apache.activemq.artemis.core:org.apache.activemq.artemis.utils diff --git a/activemq-core-client/src/main/appended-resources/META-INF/LICENSE b/artemis-core-client/src/main/appended-resources/META-INF/LICENSE similarity index 100% rename from activemq-core-client/src/main/appended-resources/META-INF/LICENSE rename to artemis-core-client/src/main/appended-resources/META-INF/LICENSE diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/api/config/ActiveMQDefaultConfiguration.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java index cea76338db..e5770e1928 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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 */ diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BaseInterceptor.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BaseInterceptor.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/BaseInterceptor.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BaseInterceptor.java index 57c788b368..55cc5040dc 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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

{ diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpoint.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpoint.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpoint.java index 6400697521..b4343603df 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpointFactory.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastEndpointFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastEndpointFactory.java index 8fbe217ee8..922c1a925b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastGroupConfiguration.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/BroadcastGroupConfiguration.java index 206f57fb8f..391634174e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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 { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/ChannelBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/ChannelBroadcastEndpointFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java index b0c4deadc1..5be1d6dca5 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/DiscoveryGroupConfiguration.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java index 51633ca159..fdce25a2d7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/FilterConstants.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/FilterConstants.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java index 959235bbe5..25c862b220 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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 diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java similarity index 82% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java index 7cfee0b58d..adea81bfa5 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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. *

* To add an interceptor to ActiveMQ server, you have to modify the server configuration file * {@literal activemq-configuration.xml}.
- * 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 { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java similarity index 99% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsBroadcastEndpoint.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java index b0bec17d0a..ea750c991e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsChannelBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsChannelBroadcastEndpoint.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsChannelBroadcastEndpoint.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsChannelBroadcastEndpoint.java index a73a62d41d..a4c48ac9d1 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsFileBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsFileBroadcastEndpoint.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java index 863e51c6ab..d6181a0ac8 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsFileBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpointFactory.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsFileBroadcastEndpointFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpointFactory.java index e4912531b1..d0676cffea 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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 { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsPropertiesBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsPropertiesBroadcastEndpoint.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java index 4875d9aac6..98f5ee9fbc 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsPropertiesBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpointFactory.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/JGroupsPropertiesBroadcastEndpointFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpointFactory.java index 87295e2e55..e2f1f20366 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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 { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java similarity index 99% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java index 536d3dee28..a159760129 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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; /** diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java index 17b3d60869..8d2fdb0058 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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 */ diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfigurationHelper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfigurationHelper.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfigurationHelper.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfigurationHelper.java index 63f9798209..19f64b1962 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/UDPBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/UDPBroadcastEndpointFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/UDPBroadcastEndpointFactory.java index 7407805a0d..fab863c7af 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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. *

- * 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 /** *

This is the member discovery implementation using direct UDP. It was extracted as a refactoring from - * {@link org.apache.activemq.core.cluster.DiscoveryGroup}

+ * {@link org.apache.activemq.artemis.core.cluster.DiscoveryGroup}

*/ private static class UDPBroadcastEndpoint implements BroadcastEndpoint { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ActiveMQClient.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ActiveMQClient.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java index 229f000ca5..fb11b88e2d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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; +package org.apache.activemq.artemis.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; +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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java similarity index 84% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java index 4a64512e18..91c8e882a7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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 *

* 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 *

* 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 *

* 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 *

* 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 *

* 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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java similarity index 68% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java index f80adfb90b..a487190e4c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/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 *
* 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. *
* - * @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); diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java similarity index 84% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java index cc090f127d..2edeb03001 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java @@ -14,11 +14,11 @@ * 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.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.Message; +import org.apache.activemq.artemis.api.core.SimpleString; /** * A ClientProducer is used to send messages to a specific address. Messages are then routed on the @@ -28,13 +28,13 @@ import org.apache.activemq.api.core.SimpleString; *

* The sending semantics can change depending on what blocking semantics are set via * {@link ServerLocator#setBlockOnDurableSend(boolean)} and - * {@link org.apache.activemq.api.core.client.ServerLocator#setBlockOnNonDurableSend(boolean)} . If set to + * {@link ServerLocator#setBlockOnNonDurableSend(boolean)} . If set to * true then for each message type, durable and non durable respectively, any exceptions such as the * address not existing or security exceptions will be thrown at the time of send. Alternatively if * set to false then exceptions will only be logged on the server.
*

* The send rate can also be controlled via {@link ServerLocator#setProducerMaxRate(int)} and the - * {@link org.apache.activemq.api.core.client.ServerLocator#setProducerWindowSize(int)}.
+ * {@link ServerLocator#setProducerWindowSize(int)}.
*
*/ public interface ClientProducer extends AutoCloseable @@ -59,7 +59,7 @@ public interface ClientProducer extends AutoCloseable * {@link ServerLocator#setBlockOnNonDurableSend(boolean)} are set to true for the * specified message type. * @param message the message to send - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message + * @throws ActiveMQException if an exception occurs while sending the message */ void send(Message message) throws ActiveMQException; @@ -71,7 +71,7 @@ public interface ClientProducer extends AutoCloseable * The handler will only get called if {@link ServerLocator#setConfirmationWindowSize(int) -1}. * @param message the message to send * @param handler handler to call after receiving a SEND acknowledgement from the server - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message + * @throws ActiveMQException if an exception occurs while sending the message */ void send(Message message, SendAcknowledgementHandler handler) throws ActiveMQException; @@ -84,7 +84,7 @@ public interface ClientProducer extends AutoCloseable * message type. * @param address the address where the message will be sent * @param message the message to send - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message + * @throws ActiveMQException if an exception occurs while sending the message */ void send(SimpleString address, Message message) throws ActiveMQException; @@ -97,7 +97,7 @@ public interface ClientProducer extends AutoCloseable * @param address the address where the message will be sent * @param message the message to send * @param handler handler to call after receiving a SEND acknowledgement from the server - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message + * @throws ActiveMQException if an exception occurs while sending the message */ void send(SimpleString address, Message message, SendAcknowledgementHandler handler) throws ActiveMQException; @@ -110,14 +110,14 @@ public interface ClientProducer extends AutoCloseable * message type. * @param address the address where the message will be sent * @param message the message to send - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message + * @throws ActiveMQException if an exception occurs while sending the message */ void send(String address, Message message) throws ActiveMQException; /** * Closes the ClientProducer. If already closed nothing is done. * - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while closing the producer + * @throws ActiveMQException if an exception occurs while closing the producer */ void close() throws ActiveMQException; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientRequestor.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientRequestor.java index 2016c5f64b..88cb7fca47 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientRequestor.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientRequestor.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.client; +package org.apache.activemq.artemis.api.core.client; import java.util.UUID; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.impl.ClientMessageImpl; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl; /** * The ClientRequestor class helps making requests. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java similarity index 84% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java index 8bf7a9a200..1a98a17686 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.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.client; +package org.apache.activemq.artemis.api.core.client; import javax.transaction.xa.XAResource; import java.util.List; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; /** * A ClientSession is a single-thread object required for producing and consuming messages. @@ -37,7 +37,7 @@ public interface ClientSession extends XAResource, AutoCloseable /** - * Just like {@link org.apache.activemq.api.core.client.ClientSession.AddressQuery#JMS_SESSION_IDENTIFIER_PROPERTY} this is + * Just like {@link ClientSession.AddressQuery#JMS_SESSION_IDENTIFIER_PROPERTY} this is * used to identify the ClientID over JMS Session. * However this is only used when the JMS Session.clientID is set (which is optional). * With this property management tools and the server can identify the jms-client-id used over JMS @@ -132,7 +132,7 @@ public interface ClientSession extends XAResource, AutoCloseable * Starts the session. * The session must be started before ClientConsumers created by the session can consume messages from the queue. * - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while starting the session + * @throws ActiveMQException if an exception occurs while starting the session */ ClientSession start() throws ActiveMQException; @@ -140,14 +140,14 @@ public interface ClientSession extends XAResource, AutoCloseable * Stops the session. * ClientConsumers created by the session can not consume messages when the session is stopped. * - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while stopping the session + * @throws ActiveMQException if an exception occurs while stopping the session */ void stop() throws ActiveMQException; /** * Closes the session. * - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while closing the session + * @throws ActiveMQException if an exception occurs while closing the session */ void close() throws ActiveMQException; @@ -204,7 +204,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the queue will be bound to this address * @param queueName the name of the queue * @param durable whether the queue is durable or not - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createQueue(SimpleString address, SimpleString queueName, boolean durable) throws ActiveMQException; @@ -216,7 +216,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the queue will be bound to this address * @param queueName the name of the queue * @param durable if the queue is durable - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createSharedQueue(SimpleString address, SimpleString queueName, boolean durable) throws ActiveMQException; @@ -229,7 +229,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName the name of the queue * @param filter whether the queue is durable or not * @param durable if the queue is durable - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createSharedQueue(SimpleString address, SimpleString queueName, SimpleString filter, boolean durable) throws ActiveMQException; @@ -239,7 +239,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the queue will be bound to this address * @param queueName the name of the queue * @param durable whether the queue is durable or not - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createQueue(String address, String queueName, boolean durable) throws ActiveMQException; @@ -248,7 +248,7 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param address the queue will be bound to this address * @param queueName the name of the queue - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createQueue(String address, String queueName) throws ActiveMQException; @@ -257,7 +257,7 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param address the queue will be bound to this address * @param queueName the name of the queue - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createQueue(SimpleString address, SimpleString queueName) throws ActiveMQException; @@ -268,7 +268,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName the name of the queue * @param filter only messages which match this filter will be put in the queue * @param durable whether the queue is durable or not - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createQueue(SimpleString address, SimpleString queueName, SimpleString filter, boolean durable) throws ActiveMQException; @@ -279,7 +279,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName the name of the queue * @param durable whether the queue is durable or not * @param filter only messages which match this filter will be put in the queue - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createQueue(String address, String queueName, String filter, boolean durable) throws ActiveMQException; @@ -288,7 +288,7 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param address the queue will be bound to this address * @param queueName the name of the queue - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createTemporaryQueue(SimpleString address, SimpleString queueName) throws ActiveMQException; @@ -297,7 +297,7 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param address the queue will be bound to this address * @param queueName the name of the queue - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createTemporaryQueue(String address, String queueName) throws ActiveMQException; @@ -307,7 +307,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the queue will be bound to this address * @param queueName the name of the queue * @param filter only messages which match this filter will be put in the queue - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createTemporaryQueue(SimpleString address, SimpleString queueName, SimpleString filter) throws ActiveMQException; @@ -317,7 +317,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the queue will be bound to this address * @param queueName the name of the queue * @param filter only messages which match this filter will be put in the queue - * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue + * @throws ActiveMQException in an exception occurs while creating the queue */ void createTemporaryQueue(String address, String queueName, String filter) throws ActiveMQException; @@ -325,7 +325,7 @@ public interface ClientSession extends XAResource, AutoCloseable * Deletes the queue. * * @param queueName the name of the queue to delete - * @throws org.apache.activemq.api.core.ActiveMQException if there is no queue for the given name or if the queue has consumers + * @throws ActiveMQException if there is no queue for the given name or if the queue has consumers */ void deleteQueue(SimpleString queueName) throws ActiveMQException; @@ -333,7 +333,7 @@ public interface ClientSession extends XAResource, AutoCloseable * Deletes the queue. * * @param queueName the name of the queue to delete - * @throws org.apache.activemq.api.core.ActiveMQException if there is no queue for the given name or if the queue has consumers + * @throws ActiveMQException if there is no queue for the given name or if the queue has consumers */ void deleteQueue(String queueName) throws ActiveMQException; @@ -344,7 +344,7 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param queueName name of the queue to consume messages from * @return a ClientConsumer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer + * @throws ActiveMQException if an exception occurs while creating the ClientConsumer */ ClientConsumer createConsumer(SimpleString queueName) throws ActiveMQException; @@ -353,7 +353,7 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param queueName name of the queue to consume messages from * @return a ClientConsumer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer + * @throws ActiveMQException if an exception occurs while creating the ClientConsumer */ ClientConsumer createConsumer(String queueName) throws ActiveMQException; @@ -363,7 +363,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName name of the queue to consume messages from * @param filter only messages which match this filter will be consumed * @return a ClientConsumer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer + * @throws ActiveMQException if an exception occurs while creating the ClientConsumer */ ClientConsumer createConsumer(SimpleString queueName, SimpleString filter) throws ActiveMQException; @@ -373,7 +373,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName name of the queue to consume messages from * @param filter only messages which match this filter will be consumed * @return a ClientConsumer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer + * @throws ActiveMQException if an exception occurs while creating the ClientConsumer */ ClientConsumer createConsumer(String queueName, String filter) throws ActiveMQException; @@ -391,7 +391,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName name of the queue to consume messages from * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer + * @throws ActiveMQException if an exception occurs while creating the ClientConsumer */ ClientConsumer createConsumer(SimpleString queueName, boolean browseOnly) throws ActiveMQException; @@ -409,7 +409,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName name of the queue to consume messages from * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer + * @throws ActiveMQException if an exception occurs while creating the ClientConsumer */ ClientConsumer createConsumer(String queueName, boolean browseOnly) throws ActiveMQException; @@ -429,7 +429,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param filter only messages which match this filter will be consumed * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer + * @throws ActiveMQException if an exception occurs while creating the ClientConsumer */ ClientConsumer createConsumer(String queueName, String filter, boolean browseOnly) throws ActiveMQException; @@ -449,7 +449,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param filter only messages which match this filter will be consumed * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer + * @throws ActiveMQException if an exception occurs while creating the ClientConsumer */ ClientConsumer createConsumer(SimpleString queueName, SimpleString filter, boolean browseOnly) throws ActiveMQException; @@ -471,7 +471,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param maxRate the maximum rate to consume messages * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer + * @throws ActiveMQException if an exception occurs while creating the ClientConsumer */ ClientConsumer createConsumer(SimpleString queueName, SimpleString filter, @@ -497,7 +497,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param maxRate the maximum rate to consume messages * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer + * @throws ActiveMQException if an exception occurs while creating the ClientConsumer */ ClientConsumer createConsumer(String queueName, String filter, int windowSize, int maxRate, boolean browseOnly) throws ActiveMQException; @@ -508,7 +508,7 @@ public interface ClientSession extends XAResource, AutoCloseable * Address must be specified every time a message is sent * * @return a ClientProducer - * @see ClientProducer#send(SimpleString, org.apache.activemq.api.core.Message) + * @see ClientProducer#send(SimpleString, org.apache.activemq.artemis.api.core.Message) */ ClientProducer createProducer() throws ActiveMQException; @@ -517,7 +517,7 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param address the address to send messages to * @return a ClientProducer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientProducer + * @throws ActiveMQException if an exception occurs while creating the ClientProducer */ ClientProducer createProducer(SimpleString address) throws ActiveMQException; @@ -526,7 +526,7 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param address the address to send messages to * @return a ClientProducer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientProducer + * @throws ActiveMQException if an exception occurs while creating the ClientProducer */ ClientProducer createProducer(String address) throws ActiveMQException; @@ -536,7 +536,7 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the address to send messages to * @param rate the producer rate * @return a ClientProducer - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientProducer + * @throws ActiveMQException if an exception occurs while creating the ClientProducer */ ClientProducer createProducer(SimpleString address, int rate) throws ActiveMQException; @@ -578,7 +578,7 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param queueName the name of the queue to query * @return a QueueQuery containing information on the given queue - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while querying the queue + * @throws ActiveMQException if an exception occurs while querying the queue */ QueueQuery queueQuery(SimpleString queueName) throws ActiveMQException; @@ -587,7 +587,7 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param address the address of the biding to query * @return a AddressQuery containing information on the binding attached to the given address - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while querying the binding + * @throws ActiveMQException if an exception occurs while querying the binding */ AddressQuery addressQuery(SimpleString address) throws ActiveMQException; @@ -610,14 +610,14 @@ public interface ClientSession extends XAResource, AutoCloseable /** * Commits the current transaction. * - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while committing the transaction + * @throws ActiveMQException if an exception occurs while committing the transaction */ void commit() throws ActiveMQException; /** * Rolls back the current transaction. * - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while rolling back the transaction + * @throws ActiveMQException if an exception occurs while rolling back the transaction */ void rollback() throws ActiveMQException; @@ -625,7 +625,7 @@ public interface ClientSession extends XAResource, AutoCloseable * Rolls back the current transaction. * * @param considerLastMessageAsDelivered the first message on deliveringMessage Buffer is considered as delivered - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while rolling back the transaction + * @throws ActiveMQException if an exception occurs while rolling back the transaction */ void rollback(boolean considerLastMessageAsDelivered) throws ActiveMQException; @@ -670,7 +670,7 @@ public interface ClientSession extends XAResource, AutoCloseable /** * Attach any metadata to the session. * - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ void addMetaData(String key, String data) throws ActiveMQException; @@ -679,7 +679,7 @@ public interface ClientSession extends XAResource, AutoCloseable * You can use this metadata to ensure that there is no other session with the same meta-data you are passing as an argument. * This is useful to simulate unique client-ids, where you may want to avoid multiple instances of your client application connected. * - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ void addUniqueMetaData(String key, String data) throws ActiveMQException; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java similarity index 87% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java index cdf13ec2fc..87ce2e9166 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java @@ -14,11 +14,11 @@ * 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.api.core.TransportConfiguration; -import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; /** @@ -33,7 +33,7 @@ public interface ClientSessionFactory extends AutoCloseable * Creates a session with XA transaction semantics. * * @return a ClientSession with XA transaction semantics - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session + * @throws ActiveMQException if an exception occurs while creating the session */ ClientSession createXASession() throws ActiveMQException; @@ -43,7 +43,7 @@ public interface ClientSessionFactory extends AutoCloseable * It is up to the client to commit when sending and acknowledging messages. * * @return a transacted ClientSession - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session + * @throws ActiveMQException if an exception occurs while creating the session * @see ClientSession#commit() */ ClientSession createTransactedSession() throws ActiveMQException; @@ -56,7 +56,7 @@ public interface ClientSessionFactory extends AutoCloseable * the session will automatically commit the transaction containing the acknowledgements. * * @return a non-transacted ClientSession - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session + * @throws ActiveMQException if an exception occurs while creating the session */ ClientSession createSession() throws ActiveMQException; @@ -66,7 +66,7 @@ public interface ClientSessionFactory extends AutoCloseable * @param autoCommitSends true to automatically commit message sends, false to commit manually * @param autoCommitAcks true to automatically commit message acknowledgement, false to commit manually * @return a ClientSession - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session + * @throws ActiveMQException if an exception occurs while creating the session */ ClientSession createSession(boolean autoCommitSends, boolean autoCommitAcks) throws ActiveMQException; @@ -77,7 +77,7 @@ public interface ClientSessionFactory extends AutoCloseable * @param autoCommitAcks true to automatically commit message acknowledgement, false to commit manually * @param ackBatchSize the batch size of the acknowledgements * @return a ClientSession - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session + * @throws ActiveMQException if an exception occurs while creating the session */ ClientSession createSession(boolean autoCommitSends, boolean autoCommitAcks, int ackBatchSize) throws ActiveMQException; @@ -88,7 +88,7 @@ public interface ClientSessionFactory extends AutoCloseable * @param autoCommitSends true to automatically commit message sends, false to commit manually * @param autoCommitAcks true to automatically commit message acknowledgement, false to commit manually * @return a ClientSession - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session + * @throws ActiveMQException if an exception occurs while creating the session */ ClientSession createSession(boolean xa, boolean autoCommitSends, boolean autoCommitAcks) throws ActiveMQException; @@ -104,7 +104,7 @@ public interface ClientSessionFactory extends AutoCloseable * @param autoCommitAcks true to automatically commit message acknowledgement, false to commit manually * @param preAcknowledge true to pre-acknowledge messages on the server, false to let the client acknowledge the messages * @return a ClientSession - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session + * @throws ActiveMQException if an exception occurs while creating the session */ ClientSession createSession(boolean xa, boolean autoCommitSends, boolean autoCommitAcks, boolean preAcknowledge) throws ActiveMQException; @@ -122,7 +122,7 @@ public interface ClientSessionFactory extends AutoCloseable * @param autoCommitAcks true to automatically commit message acknowledgement, false to commit manually * @param preAcknowledge true to pre-acknowledge messages on the server, false to let the client acknowledge the messages * @return a ClientSession - * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session + * @throws ActiveMQException if an exception occurs while creating the session */ ClientSession createSession(String username, String password, diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClusterTopologyListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClusterTopologyListener.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClusterTopologyListener.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClusterTopologyListener.java index 6c2bc7b9a9..343893802f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClusterTopologyListener.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClusterTopologyListener.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.client; +package org.apache.activemq.artemis.api.core.client; /** * A cluster topology listener. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventListener.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventListener.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventListener.java index 2f90f7af70..7e1823dc8b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventListener.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventListener.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.client; +package org.apache.activemq.artemis.api.core.client; /** * A FailoverEvent notifies the client the state if the connection changes occurred on the session. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventType.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventType.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventType.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventType.java index 1192771a66..b7ccbc48c6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/FailoverEventType.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventType.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.client; +package org.apache.activemq.artemis.api.core.client; public enum FailoverEventType { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/MessageHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/MessageHandler.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/MessageHandler.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/MessageHandler.java index 52f9d1418b..c4efb1b115 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/MessageHandler.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/MessageHandler.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.client; +package org.apache.activemq.artemis.api.core.client; /** * A MessageHandler is used to receive message asynchronously. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SendAcknowledgementHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SendAcknowledgementHandler.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java index fb87bddce8..0be79e1a76 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SendAcknowledgementHandler.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.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.client; +package org.apache.activemq.artemis.api.core.client; -import org.apache.activemq.api.core.Message; +import org.apache.activemq.artemis.api.core.Message; /** * A SendAcknowledgementHandler notifies a client when an message sent asynchronously has been diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java index 4e4b7fabcb..444e914d81 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.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.client; +package org.apache.activemq.artemis.api.core.client; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.client.impl.Topology; -import org.apache.activemq.spi.core.remoting.ClientProtocolManagerFactory; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.core.client.impl.Topology; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManagerFactory; /** * The serverLocator locates a server, but beyond that it locates a server based on a list. @@ -167,7 +167,7 @@ public interface ServerLocator extends AutoCloseable * Returns the blocking calls timeout. *

* If client's blocking calls to the server take more than this timeout, the call will throw a - * {@link org.apache.activemq.api.core.ActiveMQException} with the code {@link org.apache.activemq.api.core.ActiveMQExceptionType#CONNECTION_TIMEDOUT}. Value + * {@link org.apache.activemq.artemis.api.core.ActiveMQException} with the code {@link org.apache.activemq.artemis.api.core.ActiveMQExceptionType#CONNECTION_TIMEDOUT}. Value * is in milliseconds, default value is {@link ActiveMQClient#DEFAULT_CALL_TIMEOUT}. * * @return the blocking calls timeout @@ -399,7 +399,7 @@ public interface ServerLocator extends AutoCloseable * assign a group ID to the messages they sent. *

* if true, a random unique group ID is created and set on each message for the property - * {@link org.apache.activemq.api.core.Message#HDR_GROUP_ID}. + * {@link org.apache.activemq.artemis.api.core.Message#HDR_GROUP_ID}. * Default value is {@link ActiveMQClient#DEFAULT_AUTO_GROUP}. * * @return whether producers will automatically assign a group ID to their messages @@ -416,7 +416,7 @@ public interface ServerLocator extends AutoCloseable ServerLocator setAutoGroup(boolean autoGroup); /** - * Returns the group ID that will be eventually set on each message for the property {@link org.apache.activemq.api.core.Message#HDR_GROUP_ID}. + * Returns the group ID that will be eventually set on each message for the property {@link org.apache.activemq.artemis.api.core.Message#HDR_GROUP_ID}. *

* Default value is is {@code null} and no group ID will be set on the messages. * @@ -652,7 +652,7 @@ public interface ServerLocator extends AutoCloseable /** * Returns the class name of the connection load balancing policy. *

- * Default value is "org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy". + * Default value is "org.apache.activemq.artemis.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy". * * @return the class name of the connection load balancing policy */ @@ -661,7 +661,7 @@ public interface ServerLocator extends AutoCloseable /** * Sets the class name of the connection load balancing policy. *

- * Value must be the name of a class implementing {@link org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy}. + * Value must be the name of a class implementing {@link org.apache.activemq.artemis.api.core.client.loadbalance.ConnectionLoadBalancingPolicy}. * * @param loadBalancingPolicyClassName class name of the connection load balancing policy * @return this ServerLocator diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SessionFailureListener.java similarity index 87% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SessionFailureListener.java index 4864ba37b2..3097983720 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SessionFailureListener.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.core.remoting.FailureListener; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.remoting.FailureListener; /** * A SessionFailureListener notifies the client when a failure occurred on the session. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/TopologyMember.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/TopologyMember.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/TopologyMember.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/TopologyMember.java index 72b13742a2..0e20dd85a1 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/TopologyMember.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/TopologyMember.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.TransportConfiguration; -import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; /** * A member of the topology. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java index f7cca43cf7..27f23dfd52 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.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.client.loadbalance; +package org.apache.activemq.artemis.api.core.client.loadbalance; /** * A ConnectionLoadBalancingPolicy defines a policy to load balance between connections. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java index 544f9d8d91..856952d6e4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.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.client.loadbalance; +package org.apache.activemq.artemis.api.core.client.loadbalance; /** diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java index 9d836e8875..beed6bfe70 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.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.client.loadbalance; +package org.apache.activemq.artemis.api.core.client.loadbalance; -import org.apache.activemq.utils.Random; +import org.apache.activemq.artemis.utils.Random; /** * {@link RandomConnectionLoadBalancingPolicy#select(int)} returns a (pseudo) random integer between diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java index 0205af7b96..c3930a261d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.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.client.loadbalance; +package org.apache.activemq.artemis.api.core.client.loadbalance; -import org.apache.activemq.utils.Random; +import org.apache.activemq.artemis.utils.Random; /** * {@link RandomConnectionLoadBalancingPolicy#select(int)} chooses a the initial node randomly then subsequent requests return the same node diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java index cec194978c..d81b5c0aed 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.core.client.loadbalance; +package org.apache.activemq.artemis.api.core.client.loadbalance; import java.io.Serializable; -import org.apache.activemq.utils.Random; +import org.apache.activemq.artemis.utils.Random; /** * RoundRobinConnectionLoadBalancingPolicy corresponds to a round-robin load-balancing policy. diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/package-info.java new file mode 100644 index 0000000000..57fe0fdb08 --- /dev/null +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/package-info.java @@ -0,0 +1,18 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.artemis.api.core.client.loadbalance; + diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/package-info.java new file mode 100644 index 0000000000..51f8e6b8f2 --- /dev/null +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/package-info.java @@ -0,0 +1,18 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.artemis.api.core.client; + diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java index d565810fed..453d6fdcc4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.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.management; +package org.apache.activemq.artemis.api.core.management; import java.util.Map; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQComponentControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQComponentControl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java index f5f9e64cf7..97d6121fc6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQComponentControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.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.management; +package org.apache.activemq.artemis.api.core.management; /** * A ActiveMQComponentControl is used to manage the life cycle of a ActiveMQ component. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQServerControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQServerControl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java index bd0d269639..dffc871efc 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQServerControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.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.management; +package org.apache.activemq.artemis.api.core.management; import javax.management.MBeanOperationInfo; @@ -41,14 +41,14 @@ public interface ActiveMQServerControl /** * Returns the list of interceptors used by this server for incoming messages. * - * @see org.apache.activemq.api.core.Interceptor + * @see org.apache.activemq.artemis.api.core.Interceptor */ String[] getIncomingInterceptorClassNames(); /** * Returns the list of interceptors used by this server for outgoing messages. * - * @see org.apache.activemq.api.core.Interceptor + * @see org.apache.activemq.artemis.api.core.Interceptor */ String[] getOutgoingInterceptorClassNames(); @@ -308,7 +308,7 @@ public interface ActiveMQServerControl /** * Create a durable queue. *
- * This method throws a {@link org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException}) exception if the queue already exits. * * @param address address to bind the queue to * @param name name of the queue @@ -320,7 +320,7 @@ public interface ActiveMQServerControl /** * Create a queue. *
- * This method throws a {@link org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException}) exception if the queue already exits. * * @param address address to bind the queue to * @param name name of the queue @@ -336,7 +336,7 @@ public interface ActiveMQServerControl /** * Create a queue. *
- * This method throws a {@link org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException}) exception if the queue already exits. * * @param address address to bind the queue to * @param name name of the queue diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressControl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java index 3602f5d05b..d641a81e94 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.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.management; +package org.apache.activemq.artemis.api.core.management; import javax.management.MBeanOperationInfo; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressSettingsInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressSettingsInfo.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java index babcffadaa..eb10ca9732 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AddressSettingsInfo.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.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.management; +package org.apache.activemq.artemis.api.core.management; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.utils.json.JSONObject; // XXX no javadocs public final class AddressSettingsInfo diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BridgeControl.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BridgeControl.java index a73610abdd..ffec7fc2e4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BridgeControl.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.management; +package org.apache.activemq.artemis.api.core.management; /** @@ -43,7 +43,7 @@ public interface BridgeControl extends ActiveMQComponentControl String getFilterString(); /** - * Return the name of the org.apache.activemq.core.server.cluster.Transformer implementation associated to this bridge. + * Return the name of the org.apache.activemq.artemis.core.server.cluster.Transformer implementation associated to this bridge. */ String getTransformerClassName(); diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BroadcastGroupControl.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BroadcastGroupControl.java index 414ecd932a..7d9a2e7a57 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BroadcastGroupControl.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.management; +package org.apache.activemq.artemis.api.core.management; /** * A BroadcastGroupControl is used to manage a broadcast group. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ClusterConnectionControl.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ClusterConnectionControl.java index 1cfedb6899..07ce53d9da 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ClusterConnectionControl.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.management; +package org.apache.activemq.artemis.api.core.management; import java.util.Map; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/CoreNotificationType.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/CoreNotificationType.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java index a483e0a517..c9c2a679a3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/CoreNotificationType.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.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.management; +package org.apache.activemq.artemis.api.core.management; /** * This enum defines all core notification types diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DayCounterInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DayCounterInfo.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java index b4a41b0c7e..c8fb45d1e8 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DayCounterInfo.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.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.management; +package org.apache.activemq.artemis.api.core.management; import java.util.Arrays; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONException; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONException; +import org.apache.activemq.artemis.utils.json.JSONObject; /** * Helper class to create Java Objects from the diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DivertControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DivertControl.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DivertControl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DivertControl.java index 58f8c69226..266d406084 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/DivertControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DivertControl.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.management; +package org.apache.activemq.artemis.api.core.management; /** * A DivertControl is used to manage a divert. @@ -55,7 +55,7 @@ public interface DivertControl String getForwardingAddress(); /** - * Return the name of the org.apache.activemq.core.server.cluster.Transformer implementation associated to this bridge. + * Return the name of the org.apache.activemq.artemis.core.server.cluster.Transformer implementation associated to this bridge. */ String getTransformerClassName(); } diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java index c73f619586..ae9c091895 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.core.management; +package org.apache.activemq.artemis.api.core.management; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; /** * Helper class to use ActiveMQ Core messages to manage server resources. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java index 22ddfcf0c1..29878acc4e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.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.management; +package org.apache.activemq.artemis.api.core.management; /** * Types of notification emitted by ActiveMQ servers. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java index 8ac35a8925..7a48fc021d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.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.management; +package org.apache.activemq.artemis.api.core.management; import javax.management.ObjectName; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; /** * Helper class to build ObjectNames for ActiveMQ resources. @@ -160,7 +160,7 @@ public final class ObjectNameBuilder /** * Returns the ObjectName used by JMSServerControl. - * @see org.apache.activemq.api.jms.management.JMSServerControl + * @see org.apache.activemq.artemis.api.jms.management.JMSServerControl */ public ObjectName getJMSServerObjectName() throws Exception { @@ -169,7 +169,7 @@ public final class ObjectNameBuilder /** * Returns the ObjectName used by JMSQueueControl. - * @see org.apache.activemq.api.jms.management.JMSQueueControl + * @see org.apache.activemq.artemis.api.jms.management.JMSQueueControl */ public ObjectName getJMSQueueObjectName(final String name) throws Exception { @@ -188,7 +188,7 @@ public final class ObjectNameBuilder /** * Returns the ObjectName used by ConnectionFactoryControl. - * @see org.apache.activemq.api.jms.management.ConnectionFactoryControl + * @see org.apache.activemq.artemis.api.jms.management.ConnectionFactoryControl */ public ObjectName getConnectionFactoryObjectName(final String name) throws Exception { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Operation.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Operation.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Operation.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Operation.java index 7bab654b89..38f6473f63 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Operation.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Operation.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.management; +package org.apache.activemq.artemis.api.core.management; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Parameter.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Parameter.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Parameter.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Parameter.java index c30b253389..9a3103c5c6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/Parameter.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Parameter.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.management; +package org.apache.activemq.artemis.api.core.management; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/QueueControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java similarity index 99% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/QueueControl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java index 5caf8cec8b..316b59bd2f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/QueueControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.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.management; +package org.apache.activemq.artemis.api.core.management; import javax.management.MBeanOperationInfo; import java.util.Map; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ResourceNames.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ResourceNames.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ResourceNames.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ResourceNames.java index 8d68907ca1..d05a04c5a6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ResourceNames.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ResourceNames.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.management; +package org.apache.activemq.artemis.api.core.management; /** * Helper class used to build resource names used by management messages. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/RoleInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/RoleInfo.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/RoleInfo.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/RoleInfo.java index 20888fd6bc..920a131e1b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/RoleInfo.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/RoleInfo.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.management; +package org.apache.activemq.artemis.api.core.management; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; /** * Helper class to create Java Objects from the diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/package-info.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/package-info.java index 70942e095f..0dfae5a256 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/package-info.java @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.core.client.loadbalance; +package org.apache.activemq.artemis.api.core.management; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/package-info.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/package-info.java index d2a171c20c..96f4ff7da8 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/package-info.java @@ -14,5 +14,5 @@ * 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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java index 7c0c16ae09..544a3d7767 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java @@ -14,13 +14,13 @@ * 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 org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; /** * A ResetLimitWrappedActiveMQBuffer diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientLogger.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java index 6e884461ab..5a1cbf648d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientLogger.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client; +package org.apache.activemq.artemis.core.client; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.core.protocol.core.Packet; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; @@ -295,7 +295,7 @@ public interface ActiveMQClientLogger extends BasicLogger void packetOutOfOrder(Object obj, @Cause Throwable t); /** - * Warns about usage of {@link org.apache.activemq.api.core.client.SendAcknowledgementHandler} or JMS's {@code CompletionWindow} with + * Warns about usage of {@link org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler} or JMS's {@code CompletionWindow} with * confirmations disabled (confirmationWindowSize=-1). */ @LogMessage(level = Logger.Level.WARN) diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java index d06a114b15..4cba06aafc 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client; +package org.apache.activemq.artemis.core.client; -import org.apache.activemq.api.core.ActiveMQAddressFullException; -import org.apache.activemq.api.core.ActiveMQConnectionTimedOutException; -import org.apache.activemq.api.core.ActiveMQDisconnectedException; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.api.core.ActiveMQInterceptorRejectedPacketException; -import org.apache.activemq.api.core.ActiveMQInternalErrorException; -import org.apache.activemq.api.core.ActiveMQLargeMessageException; -import org.apache.activemq.api.core.ActiveMQLargeMessageInterruptedException; -import org.apache.activemq.api.core.ActiveMQNotConnectedException; -import org.apache.activemq.api.core.ActiveMQObjectClosedException; -import org.apache.activemq.api.core.ActiveMQTransactionOutcomeUnknownException; -import org.apache.activemq.api.core.ActiveMQTransactionRolledBackException; -import org.apache.activemq.api.core.ActiveMQUnBlockedException; -import org.apache.activemq.core.cluster.DiscoveryGroup; -import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.artemis.api.core.ActiveMQAddressFullException; +import org.apache.activemq.artemis.api.core.ActiveMQConnectionTimedOutException; +import org.apache.activemq.artemis.api.core.ActiveMQDisconnectedException; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.ActiveMQInterceptorRejectedPacketException; +import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.artemis.api.core.ActiveMQLargeMessageException; +import org.apache.activemq.artemis.api.core.ActiveMQLargeMessageInterruptedException; +import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException; +import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException; +import org.apache.activemq.artemis.api.core.ActiveMQTransactionOutcomeUnknownException; +import org.apache.activemq.artemis.api.core.ActiveMQTransactionRolledBackException; +import org.apache.activemq.artemis.api.core.ActiveMQUnBlockedException; +import org.apache.activemq.artemis.core.cluster.DiscoveryGroup; +import org.apache.activemq.artemis.spi.core.remoting.Connection; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ActiveMQXAResource.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ActiveMQXAResource.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ActiveMQXAResource.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ActiveMQXAResource.java index aceca802ec..f228386fa4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ActiveMQXAResource.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ActiveMQXAResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import javax.transaction.xa.XAResource; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AddressQueryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java similarity index 89% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AddressQueryImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java index eb0268e976..d25a6d7da8 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AddressQueryImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; public class AddressQueryImpl implements ClientSession.AddressQuery { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AfterConnectInternalListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AfterConnectInternalListener.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AfterConnectInternalListener.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AfterConnectInternalListener.java index e49840e0be..44f7ef93df 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/AfterConnectInternalListener.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AfterConnectInternalListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; /** * To be called right after the ConnectionFactory created a connection. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java index ebf98d64c3..4b380974a6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.io.File; import java.security.AccessController; @@ -24,25 +24,25 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.MessageHandler; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.spi.core.remoting.ConsumerContext; -import org.apache.activemq.spi.core.remoting.SessionContext; -import org.apache.activemq.utils.FutureLatch; -import org.apache.activemq.utils.PriorityLinkedList; -import org.apache.activemq.utils.PriorityLinkedListImpl; -import org.apache.activemq.utils.ReusableLatch; -import org.apache.activemq.utils.TokenBucketLimiter; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.MessageHandler; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext; +import org.apache.activemq.artemis.spi.core.remoting.SessionContext; +import org.apache.activemq.artemis.utils.FutureLatch; +import org.apache.activemq.artemis.utils.PriorityLinkedList; +import org.apache.activemq.artemis.utils.PriorityLinkedListImpl; +import org.apache.activemq.artemis.utils.ReusableLatch; +import org.apache.activemq.artemis.utils.TokenBucketLimiter; public final class ClientConsumerImpl implements ClientConsumerInternal { @@ -458,7 +458,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal /** * To be used by MDBs to stop any more handling of messages. * - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException * @param future the future to run once the onMessage Thread has completed */ public Thread prepareForClose(final FutureLatch future) throws ActiveMQException @@ -999,7 +999,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal return; } - org.apache.activemq.utils.FutureLatch future = new FutureLatch(); + FutureLatch future = new FutureLatch(); sessionExecutor.execute(future); @@ -1135,7 +1135,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal /** * @param message - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ private void flowControlBeforeConsumption(final ClientMessageInternal message) throws ActiveMQException { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerInternal.java similarity index 81% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerInternal.java index 27a0a7590c..2bce6d890d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerInternal.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.utils.FutureLatch; public interface ClientConsumerInternal extends ClientConsumer { @@ -44,7 +44,7 @@ public interface ClientConsumerInternal extends ClientConsumer /** * To be called by things like MDBs during shutdown of the server * - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException * @param future */ Thread prepareForClose(FutureLatch future) throws ActiveMQException; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java index 732c406397..e5e4f5107b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.io.IOException; import java.io.OutputStream; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.core.buffers.impl.ResetLimitWrappedActiveMQBuffer; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.core.buffers.impl.ResetLimitWrappedActiveMQBuffer; +import org.apache.activemq.artemis.utils.DataConstants; /** * ClientLargeMessageImpl is only created when receiving large messages. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageInternal.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageInternal.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageInternal.java index b4ce9ddd12..6c991dfc0f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageInternal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; public interface ClientLargeMessageInternal extends ClientMessageInternal diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientMessageImpl.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientMessageImpl.java index 7f961df103..c1276cffe2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientMessageImpl.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.ByteBuffer; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQPropertyConversionException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.core.message.BodyEncoder; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.reader.MessageUtil; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.core.message.BodyEncoder; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.reader.MessageUtil; /** * diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientMessageInternal.java similarity index 84% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageInternal.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientMessageInternal.java index 45e6f73039..7946bd2bc4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientMessageInternal.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.utils.TypedProperties; public interface ClientMessageInternal extends ClientMessage { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManager.java similarity index 87% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManager.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManager.java index 27636d8a53..7823ff2ae8 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManager.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManager.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.spi.core.remoting.SessionContext; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.spi.core.remoting.SessionContext; public interface ClientProducerCreditManager { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManagerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManagerImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java index 80e9ebfcc4..12bf2b2480 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditManagerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.spi.core.remoting.SessionContext; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.spi.core.remoting.SessionContext; public class ClientProducerCreditManagerImpl implements ClientProducerCreditManager { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCredits.java similarity index 86% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCredits.java index 3a463cfe56..dd8cb40456 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCredits.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.spi.core.remoting.SessionContext; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.spi.core.remoting.SessionContext; public interface ClientProducerCredits { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditsImpl.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditsImpl.java index ec201e755a..9f76b07e99 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditsImpl.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.spi.core.remoting.SessionContext; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.spi.core.remoting.SessionContext; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java index 3ff5faee8f..c2c26ff084 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.io.IOException; import java.io.InputStream; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.core.message.BodyEncoder; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; -import org.apache.activemq.spi.core.remoting.SessionContext; -import org.apache.activemq.utils.DeflaterReader; -import org.apache.activemq.utils.ActiveMQBufferInputStream; -import org.apache.activemq.utils.TokenBucketLimiter; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.core.message.BodyEncoder; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.apache.activemq.artemis.spi.core.remoting.SessionContext; +import org.apache.activemq.artemis.utils.DeflaterReader; +import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream; +import org.apache.activemq.artemis.utils.TokenBucketLimiter; +import org.apache.activemq.artemis.utils.UUIDGenerator; /** * The client-side Producer. @@ -342,7 +342,7 @@ public class ClientProducerImpl implements ClientProducerInternal /** * @param msgI * @param handler - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ private void largeMessageSend(final boolean sendBlocking, final MessageInternal msgI, final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws ActiveMQException @@ -400,7 +400,7 @@ public class ClientProducerImpl implements ClientProducerInternal * @param sendBlocking * @param msgI * @param handler - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ private void largeMessageSendServer(final boolean sendBlocking, final MessageInternal msgI, final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws ActiveMQException @@ -415,11 +415,11 @@ public class ClientProducerImpl implements ClientProducerInternal try { - for (long pos = 0; pos < bodySize; ) + for (int pos = 0; pos < bodySize; ) { final boolean lastChunk; - final int chunkLength = (int)Math.min((bodySize - pos), (long)minLargeMessageSize); + final int chunkLength = Math.min((int) (bodySize - pos), minLargeMessageSize); final ActiveMQBuffer bodyBuffer = ActiveMQBuffers.fixedBuffer(chunkLength); @@ -430,7 +430,7 @@ public class ClientProducerImpl implements ClientProducerInternal lastChunk = pos >= bodySize; SendAcknowledgementHandler messageHandler = lastChunk ? handler : null; - int creditsUsed = sessionContext.sendServerLargeMessageChunk(msgI, -1, sendBlocking, lastChunk, bodyBuffer.toByteBuffer().array(), messageHandler); + int creditsUsed = sessionContext.sendLargeMessageChunk(msgI, -1, sendBlocking, lastChunk, bodyBuffer.toByteBuffer().array(), messageHandler); try { @@ -452,7 +452,7 @@ public class ClientProducerImpl implements ClientProducerInternal * @param sendBlocking * @param msgI * @param handler - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ private void largeMessageSendBuffered(final boolean sendBlocking, final MessageInternal msgI, @@ -468,7 +468,7 @@ public class ClientProducerImpl implements ClientProducerInternal * @param msgI * @param inputStreamParameter * @param credits - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ private void largeMessageSendStreamed(final boolean sendBlocking, final MessageInternal msgI, final InputStream inputStreamParameter, final ClientProducerCredits credits, diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerInternal.java similarity index 88% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerInternal.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerInternal.java index ff3754215e..df80472da6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerInternal.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; -import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientProducer; /** * diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java index da4d476391..22300da196 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.lang.ref.WeakReference; import java.security.AccessController; @@ -31,39 +31,39 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.ActiveMQNotConnectedException; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.FailoverEventListener; -import org.apache.activemq.api.core.client.FailoverEventType; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.api.core.client.SessionFailureListener; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.ClientProtocolManager; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq.spi.core.remoting.Connector; -import org.apache.activemq.spi.core.remoting.ConnectorFactory; -import org.apache.activemq.spi.core.remoting.TopologyResponseHandler; -import org.apache.activemq.spi.core.remoting.SessionContext; -import org.apache.activemq.utils.ClassloadingUtil; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.ConfirmationWindowWarning; -import org.apache.activemq.utils.ExecutorFactory; -import org.apache.activemq.utils.OrderedExecutorFactory; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.FailoverEventListener; +import org.apache.activemq.artemis.api.core.client.FailoverEventType; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.core.client.SessionFailureListener; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.spi.core.remoting.Connector; +import org.apache.activemq.artemis.spi.core.remoting.ConnectorFactory; +import org.apache.activemq.artemis.spi.core.remoting.TopologyResponseHandler; +import org.apache.activemq.artemis.spi.core.remoting.SessionContext; +import org.apache.activemq.artemis.utils.ClassloadingUtil; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.ConfirmationWindowWarning; +import org.apache.activemq.artemis.utils.ExecutorFactory; +import org.apache.activemq.artemis.utils.OrderedExecutorFactory; +import org.apache.activemq.artemis.utils.UUIDGenerator; public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, ConnectionLifeCycleListener { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryInternal.java similarity index 80% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryInternal.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryInternal.java index 57c5a6146f..3e323ecfa5 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryInternal.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.util.concurrent.locks.Lock; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.SessionFailureListener; -import org.apache.activemq.utils.ConfirmationWindowWarning; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.SessionFailureListener; +import org.apache.activemq.artemis.utils.ConfirmationWindowWarning; public interface ClientSessionFactoryInternal extends ClientSessionFactory { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java index fd4f268aa4..becaf3a870 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -27,28 +27,28 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.FailoverEventListener; -import org.apache.activemq.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq.api.core.client.SessionFailureListener; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.ConsumerContext; -import org.apache.activemq.spi.core.remoting.SessionContext; -import org.apache.activemq.utils.ConfirmationWindowWarning; -import org.apache.activemq.utils.TokenBucketLimiterImpl; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.FailoverEventListener; +import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.artemis.api.core.client.SessionFailureListener; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext; +import org.apache.activemq.artemis.spi.core.remoting.SessionContext; +import org.apache.activemq.artemis.utils.ConfirmationWindowWarning; +import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl; +import org.apache.activemq.artemis.utils.XidCodecSupport; public final class ClientSessionImpl implements ClientSessionInternal, FailureListener { @@ -1667,7 +1667,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi * @param windowSize * @param browseOnly * @return - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ private ClientConsumer internalCreateConsumer(final SimpleString queueName, final SimpleString filterString, diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java similarity index 86% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionInternal.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java index 24d6396c02..7de2d5ef2c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; -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.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.ConsumerContext; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext; public interface ClientSessionInternal extends ClientSession { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java index c792f16944..00003c1cfa 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.io.DataInputStream; import java.io.InputStream; @@ -22,16 +22,16 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import io.netty.buffer.ByteBuf; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.utils.DataConstants; -import org.apache.activemq.utils.ActiveMQBufferInputStream; -import org.apache.activemq.utils.InflaterReader; -import org.apache.activemq.utils.InflaterWriter; -import org.apache.activemq.utils.UTF8Util; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.utils.DataConstants; +import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream; +import org.apache.activemq.artemis.utils.InflaterReader; +import org.apache.activemq.artemis.utils.InflaterWriter; +import org.apache.activemq.artemis.utils.UTF8Util; final class CompressedLargeMessageControllerImpl implements LargeMessageController { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java index 6c5966bdf1..414e301b14 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java @@ -14,27 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; import java.util.Set; -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.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.FailoverEventListener; -import org.apache.activemq.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq.api.core.client.SessionFailureListener; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.ConsumerContext; -import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.FailoverEventListener; +import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.artemis.api.core.client.SessionFailureListener; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; /** * A DelegatingSession diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageController.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageController.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageController.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageController.java index 0f8a8e09f2..6d227008b2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageController.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageController.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.io.OutputStream; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; public interface LargeMessageController extends ActiveMQBuffer { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java index 610668c20a..dea87b35fe 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.io.File; import java.io.FileNotFoundException; @@ -30,19 +30,19 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import io.netty.buffer.ByteBuf; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -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.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.utils.DataConstants; +import org.apache.activemq.artemis.utils.UTF8Util; /** - * This class aggregates several {@link org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage} + * This class aggregates several {@link org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage} * as it was being handled * by a single buffer. This buffer can be consumed as messages are arriving, and it will hold the * packets until they are read using the ChannelBuffer interface, or the setOutputStream or @@ -318,7 +318,7 @@ public class LargeMessageControllerImpl implements LargeMessageController /** * @param timeWait Milliseconds to Wait. 0 means forever - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ public synchronized boolean waitCompletion(final long timeWait) throws ActiveMQException { @@ -372,7 +372,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } /** - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ private void checkException() throws ActiveMQException { @@ -1186,7 +1186,7 @@ public class LargeMessageControllerImpl implements LargeMessageController /** * @param output * @param packet - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ private void sendPacketToOutput(final OutputStream output, final LargeData packet) throws ActiveMQException { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/QueueQueryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/QueueQueryImpl.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/QueueQueryImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/QueueQueryImpl.java index a330bfb2f5..ae6c8522a7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/QueueQueryImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/QueueQueryImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; public class QueueQueryImpl implements ClientSession.QueueQuery { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java index 2e01e1f3a8..d2c12ab019 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.io.IOException; import java.io.ObjectInputStream; @@ -39,35 +39,35 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ClusterTopologyListener; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.core.cluster.DiscoveryEntry; -import org.apache.activemq.core.cluster.DiscoveryGroup; -import org.apache.activemq.core.cluster.DiscoveryListener; -import org.apache.activemq.core.protocol.core.impl.ActiveMQClientProtocolManagerFactory; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.spi.core.remoting.ClientProtocolManager; -import org.apache.activemq.spi.core.remoting.ClientProtocolManagerFactory; -import org.apache.activemq.spi.core.remoting.Connector; -import org.apache.activemq.utils.ClassloadingUtil; -import org.apache.activemq.utils.ActiveMQThreadFactory; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.core.cluster.DiscoveryEntry; +import org.apache.activemq.artemis.core.cluster.DiscoveryGroup; +import org.apache.activemq.artemis.core.cluster.DiscoveryListener; +import org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQClientProtocolManagerFactory; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.remoting.Connector; +import org.apache.activemq.artemis.utils.ClassloadingUtil; +import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; +import org.apache.activemq.artemis.utils.UUIDGenerator; /** - * This is the implementation of {@link org.apache.activemq.api.core.client.ServerLocator} and all + * This is the implementation of {@link org.apache.activemq.artemis.api.core.client.ServerLocator} and all * the proper javadoc is located on that interface. */ public final class ServerLocatorImpl implements ServerLocatorInternal, DiscoveryListener diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorInternal.java similarity index 84% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorInternal.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorInternal.java index d9e660d28a..735e5ec587 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ServerLocatorInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorInternal.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; public interface ServerLocatorInternal extends ServerLocator { @@ -53,7 +53,7 @@ public interface ServerLocatorInternal extends ServerLocator /** * Like {@link #connect()} but it does not log warnings if it fails to connect. - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ ClientSessionFactoryInternal connectNoWarnings() throws ActiveMQException; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/Topology.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/Topology.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java index 2742001bab..c7e1eecbf6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/Topology.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; import java.io.Serializable; import java.util.ArrayList; @@ -27,10 +27,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClusterTopologyListener; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.spi.core.remoting.Connector; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.spi.core.remoting.Connector; public final class Topology implements Serializable { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/TopologyMemberImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/TopologyMemberImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java index 597d71e710..ee9a4b5ca2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/TopologyMemberImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.client.impl; +package org.apache.activemq.artemis.core.client.impl; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; public final class TopologyMemberImpl implements TopologyMember { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryEntry.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryEntry.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryEntry.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryEntry.java index 6028c384ca..8173af1a2c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryEntry.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryEntry.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.cluster; +package org.apache.activemq.artemis.core.cluster; -import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; public class DiscoveryEntry { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryGroup.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryGroup.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java index 2b6dd75ee8..d41d432e6e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryGroup.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.cluster; +package org.apache.activemq.artemis.core.cluster; import java.util.ArrayList; import java.util.HashMap; @@ -23,19 +23,19 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.BroadcastEndpoint; -import org.apache.activemq.api.core.BroadcastEndpointFactory; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.server.management.NotificationService; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.BroadcastEndpoint; +import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.server.management.NotificationService; +import org.apache.activemq.artemis.utils.TypedProperties; /** * This class is used to search for members on the cluster through the opaque interface {@link BroadcastEndpoint}. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryListener.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryListener.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryListener.java index 0842ac9be7..8527e4bd26 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/cluster/DiscoveryListener.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.cluster; +package org.apache.activemq.artemis.core.cluster; import java.util.List; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/exception/ActiveMQXAException.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/exception/ActiveMQXAException.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/exception/ActiveMQXAException.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/exception/ActiveMQXAException.java index 80db87012b..d1c7587b9a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/exception/ActiveMQXAException.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/exception/ActiveMQXAException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.exception; +package org.apache.activemq.artemis.core.exception; import javax.transaction.xa.XAException; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/message/BodyEncoder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/core/message/BodyEncoder.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java index 8c28d69fbf..951f156476 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/message/BodyEncoder.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.message; +package org.apache.activemq.artemis.core.message; import java.nio.ByteBuffer; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; /** * Class used to encode message body into buffers. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java index 4490fc20b7..1fc3073e4c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.message.impl; +package org.apache.activemq.artemis.core.message.impl; import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQPropertyConversionException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.buffers.impl.ResetLimitWrappedActiveMQBuffer; -import org.apache.activemq.core.message.BodyEncoder; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.ByteUtil; -import org.apache.activemq.utils.DataConstants; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.UUID; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.buffers.impl.ResetLimitWrappedActiveMQBuffer; +import org.apache.activemq.artemis.core.message.BodyEncoder; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.ByteUtil; +import org.apache.activemq.artemis.utils.DataConstants; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.UUID; /** * A concrete implementation of a message diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageInternal.java similarity index 78% rename from activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageInternal.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageInternal.java index 848ebf7d74..193c703246 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/message/impl/MessageInternal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageInternal.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.message.impl; +package org.apache.activemq.artemis.core.message.impl; import java.io.InputStream; -import org.apache.activemq.api.core.ActiveMQBuffer; -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.core.message.BodyEncoder; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.message.BodyEncoder; +import org.apache.activemq.artemis.utils.TypedProperties; public interface MessageInternal extends Message { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/ClientPacketDecoder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/ClientPacketDecoder.java similarity index 69% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/ClientPacketDecoder.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/ClientPacketDecoder.java index 6c057bdaae..9eaeba166f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/ClientPacketDecoder.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/ClientPacketDecoder.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol; +package org.apache.activemq.artemis.core.protocol; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_LARGE_MSG; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_MSG; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_LARGE_MSG; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_MSG; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.client.impl.ClientLargeMessageImpl; -import org.apache.activemq.core.client.impl.ClientMessageImpl; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.PacketDecoder; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveClientLargeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.client.impl.ClientLargeMessageImpl; +import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketDecoder; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveClientLargeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveMessage; public class ClientPacketDecoder extends PacketDecoder { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Channel.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java similarity index 80% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Channel.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java index 75469522c5..323e492c19 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Channel.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core; +package org.apache.activemq.artemis.core.protocol.core; import java.util.concurrent.locks.Lock; -import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQException; /** - * A channel is a way of interleaving data meant for different endpoints over the same {@link org.apache.activemq.core.protocol.core.CoreRemotingConnection}. + * A channel is a way of interleaving data meant for different endpoints over the same {@link org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection}. *

* Any packet sent will have its channel id set to the specific channel sending so it can be routed to its correct channel - * when received by the {@link org.apache.activemq.core.protocol.core.CoreRemotingConnection}. see {@link org.apache.activemq.core.protocol.core.Packet#setChannelID(long)}. + * when received by the {@link org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection}. see {@link org.apache.activemq.artemis.core.protocol.core.Packet#setChannelID(long)}. *

- * Each Channel should will forward any packets received to its {@link org.apache.activemq.core.protocol.core.ChannelHandler}. + * Each Channel should will forward any packets received to its {@link org.apache.activemq.artemis.core.protocol.core.ChannelHandler}. *

* A Channel *does not* support concurrent access by more than one thread! */ @@ -71,19 +71,19 @@ public interface Channel * @param packet the packet to send * @param expectedPacket the packet being expected. * @return the response - * @throws org.apache.activemq.api.core.ActiveMQException if an error occurs during the send + * @throws ActiveMQException if an error occurs during the send */ Packet sendBlocking(Packet packet, byte expectedPacket) throws ActiveMQException; /** - * Sets the {@link org.apache.activemq.core.protocol.core.ChannelHandler} that this channel should + * Sets the {@link org.apache.activemq.artemis.core.protocol.core.ChannelHandler} that this channel should * forward received packets to. * @param handler the handler */ void setHandler(ChannelHandler handler); /** - * Gets the {@link org.apache.activemq.core.protocol.core.ChannelHandler} that this channel should + * Gets the {@link org.apache.activemq.artemis.core.protocol.core.ChannelHandler} that this channel should * forward received packets to. * @return the current channel handler */ @@ -133,12 +133,12 @@ public interface Channel void unlock(); /** - * forces any {@link org.apache.activemq.core.protocol.core.Channel#sendBlocking(Packet, byte)} request to return with an exception. + * forces any {@link org.apache.activemq.artemis.core.protocol.core.Channel#sendBlocking(Packet, byte)} request to return with an exception. */ void returnBlocking(); /** - * forces any {@link org.apache.activemq.core.protocol.core.Channel#sendBlocking(Packet, byte)} request to return with an exception. + * forces any {@link org.apache.activemq.artemis.core.protocol.core.Channel#sendBlocking(Packet, byte)} request to return with an exception. */ void returnBlocking(Throwable cause); @@ -174,9 +174,9 @@ public interface Channel void flushConfirmations(); /** - * Called by {@link org.apache.activemq.core.protocol.core.CoreRemotingConnection} when a packet is received. + * Called by {@link org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection} when a packet is received. *

- * This method should then call its {@link org.apache.activemq.core.protocol.core.ChannelHandler} after appropriate processing of + * This method should then call its {@link org.apache.activemq.artemis.core.protocol.core.ChannelHandler} after appropriate processing of * the packet * * @param packet the packet to process. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/ChannelHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/ChannelHandler.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/ChannelHandler.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/ChannelHandler.java index c363280006..351d56276f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/ChannelHandler.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/ChannelHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core; +package org.apache.activemq.artemis.core.protocol.core; /** diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CommandConfirmationHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CommandConfirmationHandler.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CommandConfirmationHandler.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CommandConfirmationHandler.java index ab41bce8bb..c971847e98 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CommandConfirmationHandler.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CommandConfirmationHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core; +package org.apache.activemq.artemis.core.protocol.core; /** diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CoreRemotingConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CoreRemotingConnection.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java index fdbe8ebcb7..25e827559a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/CoreRemotingConnection.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core; +package org.apache.activemq.artemis.core.protocol.core; -import org.apache.activemq.core.security.ActiveMQPrincipal; -import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.core.security.ActiveMQPrincipal; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; /** diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Packet.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Packet.java similarity index 89% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Packet.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Packet.java index 40f5062993..fd53d6109d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/Packet.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Packet.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core; +package org.apache.activemq.artemis.core.protocol.core; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; /** * A Packet represents a packet of data transmitted over a connection. @@ -56,7 +56,7 @@ public interface Packet byte getType(); /** - * Encodes the packet and returns a {@link org.apache.activemq.api.core.ActiveMQBuffer} containing the data + * Encodes the packet and returns a {@link ActiveMQBuffer} containing the data * * @param connection the connection * @return the buffer to encode to diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java similarity index 86% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java index 0f10f386ae..0a5dcca5f5 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -22,43 +22,43 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import io.netty.channel.ChannelPipeline; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.protocol.ClientPacketDecoder; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.ChannelHandler; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.wireformat.CheckFailoverMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectMessage_V2; -import org.apache.activemq.core.protocol.core.impl.wireformat.Ping; -import org.apache.activemq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; -import org.apache.activemq.core.remoting.impl.netty.ActiveMQFrameDecoder2; -import org.apache.activemq.core.version.Version; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.ClientProtocolManager; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.remoting.TopologyResponseHandler; -import org.apache.activemq.spi.core.remoting.SessionContext; -import org.apache.activemq.utils.VersionLoader; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.protocol.ClientPacketDecoder; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.ChannelHandler; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CheckFailoverMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSessionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectMessage_V2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.Ping; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; +import org.apache.activemq.artemis.core.remoting.impl.netty.ActiveMQFrameDecoder2; +import org.apache.activemq.artemis.core.version.Version; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.remoting.TopologyResponseHandler; +import org.apache.activemq.artemis.spi.core.remoting.SessionContext; +import org.apache.activemq.artemis.utils.VersionLoader; /** * This class will return specific packets for different types of actions happening on a messaging protocol. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java similarity index 85% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java index d312b52dd3..5c3afc2a52 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; -import org.apache.activemq.spi.core.remoting.ClientProtocolManager; -import org.apache.activemq.spi.core.remoting.ClientProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManagerFactory; public class ActiveMQClientProtocolManagerFactory implements ClientProtocolManagerFactory { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQConsumerContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQConsumerContext.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQConsumerContext.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQConsumerContext.java index f58dbe820d..4ec5c5a064 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQConsumerContext.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQConsumerContext.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; -import org.apache.activemq.spi.core.remoting.ConsumerContext; +import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext; public class ActiveMQConsumerContext extends ConsumerContext { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java similarity index 80% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java index 7097bd2aa0..42a3e84c9f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -26,90 +26,89 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.core.client.impl.AddressQueryImpl; -import org.apache.activemq.core.client.impl.ClientConsumerImpl; -import org.apache.activemq.core.client.impl.ClientConsumerInternal; -import org.apache.activemq.core.client.impl.ClientLargeMessageInternal; -import org.apache.activemq.core.client.impl.ClientMessageInternal; -import org.apache.activemq.core.client.impl.ClientProducerCreditsImpl; -import org.apache.activemq.core.client.impl.ClientSessionImpl; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.ChannelHandler; -import org.apache.activemq.core.protocol.core.CommandConfirmationHandler; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReattachSessionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.RollbackMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage_V2; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionCloseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionExpireMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage_V2; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendLargeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXACommitMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAEndMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAForgetMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAJoinMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAResumeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXARollbackMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAStartMessage; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.remoting.SessionContext; -import org.apache.activemq.utils.TokenBucketLimiterImpl; -import org.apache.activemq.utils.VersionLoader; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.core.client.impl.AddressQueryImpl; +import org.apache.activemq.artemis.core.client.impl.ClientConsumerImpl; +import org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal; +import org.apache.activemq.artemis.core.client.impl.ClientLargeMessageInternal; +import org.apache.activemq.artemis.core.client.impl.ClientMessageInternal; +import org.apache.activemq.artemis.core.client.impl.ClientProducerCreditsImpl; +import org.apache.activemq.artemis.core.client.impl.ClientSessionImpl; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.ChannelHandler; +import org.apache.activemq.artemis.core.protocol.core.CommandConfirmationHandler; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSessionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReattachSessionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.RollbackMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage_V2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionCloseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionExpireMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage_V2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendLargeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXACommitMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAEndMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAForgetMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAJoinMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAResumeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXARollbackMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAStartMessage; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.remoting.SessionContext; +import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl; +import org.apache.activemq.artemis.utils.VersionLoader; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.DISCONNECT_CONSUMER; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.EXCEPTION; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_CONTINUATION; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_LARGE_MSG; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_MSG; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.DISCONNECT_CONSUMER; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.EXCEPTION; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_CONTINUATION; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_LARGE_MSG; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_MSG; public class ActiveMQSessionContext extends SessionContext { - private static final long MAX_RESENDCACHE_WAITING_TIME = 10000L;//10 sec private final Channel sessionChannel; private final int serverVersion; private int confirmationWindow; @@ -426,27 +425,6 @@ public class ActiveMQSessionContext extends SessionContext @Override public int sendLargeMessageChunk(MessageInternal msgI, long messageBodySize, boolean sendBlocking, boolean lastChunk, byte[] chunk, SendAcknowledgementHandler messageHandler) throws ActiveMQException - { - final boolean requiresResponse = lastChunk && sendBlocking; - final SessionSendContinuationMessage chunkPacket = - new SessionSendContinuationMessage(msgI, chunk, !lastChunk, - requiresResponse, messageBodySize, messageHandler); - - if (requiresResponse) - { - // When sending it blocking, only the last chunk will be blocking. - sessionChannel.sendBlocking(chunkPacket, PacketImpl.NULL_RESPONSE); - } - else - { - sessionChannel.send(chunkPacket); - } - - return chunkPacket.getPacketSize(); - } - - @Override - public int sendServerLargeMessageChunk(MessageInternal msgI, long messageBodySize, boolean sendBlocking, boolean lastChunk, byte[] chunk, SendAcknowledgementHandler messageHandler) throws ActiveMQException { final boolean requiresResponse = lastChunk && sendBlocking; final SessionSendContinuationMessage chunkPacket = @@ -774,7 +752,7 @@ public class ActiveMQSessionContext extends SessionContext /** * This doesn't apply to other protocols probably, so it will be an ActiveMQ exclusive feature * - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ private void handleConsumerDisconnected(DisconnectConsumerMessage packet) throws ActiveMQException { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/BackwardsCompatibilityUtils.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/BackwardsCompatibilityUtils.java similarity index 87% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/BackwardsCompatibilityUtils.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/BackwardsCompatibilityUtils.java index eb9d886aaf..b0efa8ea9b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/BackwardsCompatibilityUtils.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/BackwardsCompatibilityUtils.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.TopologyMember; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.TopologyMember; /** * This is a utility class to house any HornetQ client specific backwards compatibility methods. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ChannelImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ChannelImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java index a71aed562a..7ad87511f8 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ChannelImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; import java.util.EnumSet; import java.util.List; @@ -25,20 +25,20 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.ChannelHandler; -import org.apache.activemq.core.protocol.core.CommandConfirmationHandler; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.PacketsConfirmedMessage; -import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.ChannelHandler; +import org.apache.activemq.artemis.core.protocol.core.CommandConfirmationHandler; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.PacketsConfirmedMessage; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; public final class ChannelImpl implements Channel { diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java new file mode 100644 index 0000000000..c8d36bdf15 --- /dev/null +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java @@ -0,0 +1,487 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.artemis.core.protocol.core.impl; + +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY_V2; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CLUSTER_TOPOLOGY_V3; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATESESSION; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATESESSION_RESP; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATE_QUEUE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.DELETE_QUEUE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.DISCONNECT; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.DISCONNECT_V2; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.DISCONNECT_CONSUMER; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.EXCEPTION; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.NULL_RESPONSE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.PACKETS_CONFIRMED; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.PING; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REATTACH_SESSION; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REATTACH_SESSION_RESP; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CHECK_FOR_FAILOVER; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_ADD_METADATA; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_ADD_METADATA2; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY_RESP; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY_RESP_V2; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_CLOSE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_COMMIT; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_CONSUMER_CLOSE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_CREATECONSUMER; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_EXPIRED; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_FLOWTOKEN; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_INDIVIDUAL_ACKNOWLEDGE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_CREDITS; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_FAIL_CREDITS; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_PRODUCER_REQUEST_CREDITS; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY_RESP; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY_RESP_V2; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_CONTINUATION; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_START; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_STOP; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_UNIQUE_ADD_METADATA; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_END; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_FAILED; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_FORGET; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT_RESP; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS_RESP; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_JOIN; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_PREPARE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_RESP; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_RESUME; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_ROLLBACK; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT_RESP; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_START; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_SUSPEND; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SUBSCRIBE_TOPOLOGY; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SUBSCRIBE_TOPOLOGY_V2; + +import java.io.Serializable; + +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CheckFailoverMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSessionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectMessage_V2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.NullResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.PacketsConfirmedMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.Ping; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReattachSessionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.RollbackMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage_V2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionCloseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionCommitMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionExpireMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage_V2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXACommitMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAEndMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAForgetMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAJoinMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAResumeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXARollbackMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAStartMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; + +public abstract class PacketDecoder implements Serializable +{ + public abstract Packet decode(final ActiveMQBuffer in); + + public Packet decode(byte packetType) + { + Packet packet; + + switch (packetType) + { + case PING: + { + packet = new Ping(); + break; + } + case DISCONNECT: + { + packet = new DisconnectMessage(); + break; + } + case DISCONNECT_V2: + { + packet = new DisconnectMessage_V2(); + break; + } + case DISCONNECT_CONSUMER: + { + packet = new DisconnectConsumerMessage(); + break; + } + case EXCEPTION: + { + packet = new ActiveMQExceptionMessage(); + break; + } + case PACKETS_CONFIRMED: + { + packet = new PacketsConfirmedMessage(); + break; + } + case CREATESESSION: + { + packet = new CreateSessionMessage(); + break; + } + case CHECK_FOR_FAILOVER: + { + packet = new CheckFailoverMessage(); + break; + } + case CREATESESSION_RESP: + { + packet = new CreateSessionResponseMessage(); + break; + } + case REATTACH_SESSION: + { + packet = new ReattachSessionMessage(); + break; + } + case REATTACH_SESSION_RESP: + { + packet = new ReattachSessionResponseMessage(); + break; + } + case SESS_CLOSE: + { + packet = new SessionCloseMessage(); + break; + } + case SESS_CREATECONSUMER: + { + packet = new SessionCreateConsumerMessage(); + break; + } + case SESS_ACKNOWLEDGE: + { + packet = new SessionAcknowledgeMessage(); + break; + } + case SESS_EXPIRED: + { + packet = new SessionExpireMessage(); + break; + } + case SESS_COMMIT: + { + packet = new SessionCommitMessage(); + break; + } + case SESS_ROLLBACK: + { + packet = new RollbackMessage(); + break; + } + case SESS_QUEUEQUERY: + { + packet = new SessionQueueQueryMessage(); + break; + } + case SESS_QUEUEQUERY_RESP: + { + packet = new SessionQueueQueryResponseMessage(); + break; + } + case SESS_QUEUEQUERY_RESP_V2: + { + packet = new SessionQueueQueryResponseMessage_V2(); + break; + } + case CREATE_QUEUE: + { + packet = new CreateQueueMessage(); + break; + } + case CREATE_SHARED_QUEUE: + { + packet = new CreateSharedQueueMessage(); + break; + } + case DELETE_QUEUE: + { + packet = new SessionDeleteQueueMessage(); + break; + } + case SESS_BINDINGQUERY: + { + packet = new SessionBindingQueryMessage(); + break; + } + case SESS_BINDINGQUERY_RESP: + { + packet = new SessionBindingQueryResponseMessage(); + break; + } + case SESS_BINDINGQUERY_RESP_V2: + { + packet = new SessionBindingQueryResponseMessage_V2(); + break; + } + case SESS_XA_START: + { + packet = new SessionXAStartMessage(); + break; + } + case SESS_XA_FAILED: + { + packet = new SessionXAAfterFailedMessage(); + break; + } + case SESS_XA_END: + { + packet = new SessionXAEndMessage(); + break; + } + case SESS_XA_COMMIT: + { + packet = new SessionXACommitMessage(); + break; + } + case SESS_XA_PREPARE: + { + packet = new SessionXAPrepareMessage(); + break; + } + case SESS_XA_RESP: + { + packet = new SessionXAResponseMessage(); + break; + } + case SESS_XA_ROLLBACK: + { + packet = new SessionXARollbackMessage(); + break; + } + case SESS_XA_JOIN: + { + packet = new SessionXAJoinMessage(); + break; + } + case SESS_XA_SUSPEND: + { + packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND); + break; + } + case SESS_XA_RESUME: + { + packet = new SessionXAResumeMessage(); + break; + } + case SESS_XA_FORGET: + { + packet = new SessionXAForgetMessage(); + break; + } + case SESS_XA_INDOUBT_XIDS: + { + packet = new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS); + break; + } + case SESS_XA_INDOUBT_XIDS_RESP: + { + packet = new SessionXAGetInDoubtXidsResponseMessage(); + break; + } + case SESS_XA_SET_TIMEOUT: + { + packet = new SessionXASetTimeoutMessage(); + break; + } + case SESS_XA_SET_TIMEOUT_RESP: + { + packet = new SessionXASetTimeoutResponseMessage(); + break; + } + case SESS_XA_GET_TIMEOUT: + { + packet = new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT); + break; + } + case SESS_XA_GET_TIMEOUT_RESP: + { + packet = new SessionXAGetTimeoutResponseMessage(); + break; + } + case SESS_START: + { + packet = new PacketImpl(PacketImpl.SESS_START); + break; + } + case SESS_STOP: + { + packet = new PacketImpl(PacketImpl.SESS_STOP); + break; + } + case SESS_FLOWTOKEN: + { + packet = new SessionConsumerFlowCreditMessage(); + break; + } + case SESS_CONSUMER_CLOSE: + { + packet = new SessionConsumerCloseMessage(); + break; + } + case SESS_INDIVIDUAL_ACKNOWLEDGE: + { + packet = new SessionIndividualAcknowledgeMessage(); + break; + } + case NULL_RESPONSE: + { + packet = new NullResponseMessage(); + break; + } + case SESS_RECEIVE_CONTINUATION: + { + packet = new SessionReceiveContinuationMessage(); + break; + } + case SESS_SEND_CONTINUATION: + { + packet = new SessionSendContinuationMessage(); + break; + } + case SESS_PRODUCER_REQUEST_CREDITS: + { + packet = new SessionRequestProducerCreditsMessage(); + break; + } + case SESS_PRODUCER_CREDITS: + { + packet = new SessionProducerCreditsMessage(); + break; + } + case SESS_PRODUCER_FAIL_CREDITS: + { + packet = new SessionProducerCreditsFailMessage(); + break; + } + case SESS_FORCE_CONSUMER_DELIVERY: + { + packet = new SessionForceConsumerDelivery(); + break; + } + case CLUSTER_TOPOLOGY: + { + packet = new ClusterTopologyChangeMessage(); + break; + } + case CLUSTER_TOPOLOGY_V2: + { + packet = new ClusterTopologyChangeMessage_V2(); + break; + } + case CLUSTER_TOPOLOGY_V3: + { + packet = new ClusterTopologyChangeMessage_V3(); + break; + } + case SUBSCRIBE_TOPOLOGY: + { + packet = new SubscribeClusterTopologyUpdatesMessage(); + break; + } + case SUBSCRIBE_TOPOLOGY_V2: + { + packet = new SubscribeClusterTopologyUpdatesMessageV2(); + break; + } + case SESS_ADD_METADATA: + { + packet = new SessionAddMetaDataMessage(); + break; + } + case SESS_ADD_METADATA2: + { + packet = new SessionAddMetaDataMessageV2(); + break; + } + case SESS_UNIQUE_ADD_METADATA: + { + packet = new SessionUniqueAddMetaDataMessage(); + break; + } + case PacketImpl.CHECK_FOR_FAILOVER_REPLY: + { + packet = new CheckFailoverReplyMessage(); + break; + } + default: + { + throw ActiveMQClientMessageBundle.BUNDLE.invalidType(packetType); + } + } + + return packet; + } + +} diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java index ffb111cccc..2ed7c769f1 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.utils.DataConstants; public class PacketImpl implements Packet { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/RemotingConnectionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/RemotingConnectionImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java index 9bc4633d53..7eb36ffc0e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/RemotingConnectionImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; import java.util.HashSet; import java.util.List; @@ -23,21 +23,21 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; -import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectMessage_V2; -import org.apache.activemq.core.security.ActiveMQPrincipal; -import org.apache.activemq.spi.core.protocol.AbstractRemotingConnection; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.utils.SimpleIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectMessage_V2; +import org.apache.activemq.artemis.core.security.ActiveMQPrincipal; +import org.apache.activemq.artemis.spi.core.protocol.AbstractRemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.utils.SimpleIDGenerator; public class RemotingConnectionImpl extends AbstractRemotingConnection implements CoreRemotingConnection { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java similarity index 89% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java index 13d01df273..2ae546a19b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ActiveMQExceptionMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CheckFailoverMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CheckFailoverMessage.java similarity index 87% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CheckFailoverMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CheckFailoverMessage.java index bf7e074b36..f9146dc36a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CheckFailoverMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CheckFailoverMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class CheckFailoverMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java similarity index 88% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java index 8d397fa22f..818594fbe6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class CheckFailoverReplyMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java index 8bc31ed0a9..c9cdc4193e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ClusterTopologyChangeMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java index 2d5ccaef26..74f741d133 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; /** * Clebert Suconic diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java index fa96e3f2ef..6e1f329807 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; public class ClusterTopologyChangeMessage_V3 extends ClusterTopologyChangeMessage_V2 { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateQueueMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateQueueMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java index 692b9980f2..9212f5db51 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateQueueMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class CreateQueueMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSessionMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSessionMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java index 8820d83952..585cbf57d2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSessionMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class CreateSessionMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java index 0ffa83b00e..d735ad0ec2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class CreateSessionResponseMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java index ecc27804c0..e61dd1bb43 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class CreateSharedQueueMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java similarity index 87% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java index 22c478e1b2..9e32f022b1 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class DisconnectConsumerMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java index 3ea9c4d252..e9c55943b5 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class DisconnectMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java index d18385db11..4133702cc0 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; public class DisconnectMessage_V2 extends DisconnectMessage { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/MessagePacket.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/MessagePacket.java similarity index 80% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/MessagePacket.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/MessagePacket.java index 2d772d85fc..17d7c04112 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/MessagePacket.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/MessagePacket.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public abstract class MessagePacket extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NullResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage.java similarity index 87% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NullResponseMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage.java index eeadf84b3e..8f20e6917e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NullResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class NullResponseMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java index f12d9b0f1b..ae6bb39328 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class PacketsConfirmedMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/Ping.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/Ping.java similarity index 83% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/Ping.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/Ping.java index 7d0854339e..6e2c196c4b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/Ping.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/Ping.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; /** - * Ping is sent on the client side by {@link org.apache.activemq.core.client.impl.ClientSessionFactoryImpl}. At the server's - * side it is handled by {@link org.apache.activemq.core.remoting.server.impl.RemotingServiceImpl} - * @see org.apache.activemq.spi.core.protocol.RemotingConnection#checkDataReceived() + * Ping is sent on the client side by {@link org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl}. At the server's + * side it is handled by {@link org.apache.activemq.artemis.core.remoting.server.impl.RemotingServiceImpl} + * @see org.apache.activemq.artemis.spi.core.protocol.RemotingConnection#checkDataReceived() */ public final class Ping extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionMessage.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionMessage.java index dba5246a90..9a6177d2b9 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ReattachSessionMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java index 75652f4b58..440d99038e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ReattachSessionResponseMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/RollbackMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/RollbackMessage.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/RollbackMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/RollbackMessage.java index 5e6d777909..528b2a12f2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/RollbackMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/RollbackMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class RollbackMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java index eba48259d0..3d8a23e217 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionAcknowledgeMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java index d92939fb1a..251e4ebb2f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; /** * A SessionAddMetaDataMessage diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java index 2735be67e1..c4332311c3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; /** * A SessionAddMetaDataMessage diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java similarity index 89% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java index a0c079319a..d6f96ee1da 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionBindingQueryMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java index 4638a66e73..17889e83f4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; /** * diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java index 25686715d8..88a55ba8bf 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.util.List; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; public class SessionBindingQueryResponseMessage_V2 extends SessionBindingQueryResponseMessage { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCloseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java similarity index 89% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCloseMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java index 647076a829..c22cd12715 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCloseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionCloseMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCommitMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCommitMessage.java similarity index 86% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCommitMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCommitMessage.java index 783ce4a86e..c665deda75 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCommitMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCommitMessage.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionCommitMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java index dc704f593a..e60c6be21a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionConsumerCloseMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java index c6eae6a77f..38fba95dba 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionConsumerFlowCreditMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java index 41a9f3d74d..c372842326 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.DataConstants; public abstract class SessionContinuationMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java index 91ee54ab7e..4755d73acb 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionCreateConsumerMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java index 36576e8ab9..3c69b7e54d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionDeleteQueueMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java index 0169fbbc96..7419010094 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionExpireMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java index c30bb9b260..351edf23c7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; /** * diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java index 8267970f0f..5fc7aae16d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionIndividualAcknowledgeMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java index 6cc261adb6..0b05402ea7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionProducerCreditsFailMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java index cf887472d7..a29aabacd2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionProducerCreditsMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java similarity index 89% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java index 17555a08d0..396b97abc9 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionQueueQueryMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java index fca0268ef4..a24221b7bb 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.core.client.impl.QueueQueryImpl; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.server.QueueQueryResult; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.core.client.impl.QueueQueryImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.server.QueueQueryResult; public class SessionQueueQueryResponseMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java index d89b89595a..4158a9df11 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.core.client.impl.QueueQueryImpl; -import org.apache.activemq.core.server.QueueQueryResult; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.core.client.impl.QueueQueryImpl; +import org.apache.activemq.artemis.core.server.QueueQueryResult; public class SessionQueueQueryResponseMessage_V2 extends SessionQueueQueryResponseMessage { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java similarity index 80% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java index aa2a26e69b..d6562e0cee 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.client.impl.ClientLargeMessageInternal; -import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.client.impl.ClientLargeMessageInternal; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; public class SessionReceiveClientLargeMessage extends SessionReceiveLargeMessage { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java index f1a3f613cc..9ca771d435 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.utils.DataConstants; public class SessionReceiveContinuationMessage extends SessionContinuationMessage { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java index 344c6140b8..fceda161ef 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionReceiveLargeMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java index 829e3391e9..d9d07773cb 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.utils.DataConstants; public class SessionReceiveMessage extends MessagePacket { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java index 4034b9940d..4170cd4874 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionRequestProducerCreditsMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java similarity index 85% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java index e21bb0fac0..91081c9d63 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; /** * A SessionSendContinuationMessage
@@ -30,12 +30,12 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage // Used on confirmation handling private MessageInternal message; /** - * In case, we are using a different handler than the one set on the {@link org.apache.activemq.api.core.client.ClientSession} + * In case, we are using a different handler than the one set on the {@link org.apache.activemq.artemis.api.core.client.ClientSession} *

* This field is only used at the client side. * - * @see org.apache.activemq.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) - * @see org.apache.activemq.api.core.client.ClientProducer#send(org.apache.activemq.api.core.SimpleString, org.apache.activemq.api.core.Message, SendAcknowledgementHandler) + * @see org.apache.activemq.artemis.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) + * @see org.apache.activemq.artemis.api.core.client.ClientProducer#send(org.apache.activemq.artemis.api.core.SimpleString, org.apache.activemq.artemis.api.core.Message, SendAcknowledgementHandler) */ private final transient SendAcknowledgementHandler handler; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java similarity index 89% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java index 2ded85f3e5..1dbb4bbca9 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionSendLargeMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java similarity index 81% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java index 97661aad98..fa4516b3f2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.utils.DataConstants; public class SessionSendMessage extends MessagePacket { @@ -28,12 +28,12 @@ public class SessionSendMessage extends MessagePacket private boolean requiresResponse; /** - * In case, we are using a different handler than the one set on the {@link org.apache.activemq.api.core.client.ClientSession} + * In case, we are using a different handler than the one set on the {@link org.apache.activemq.artemis.api.core.client.ClientSession} *

* This field is only used at the client side. * - * @see org.apache.activemq.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) - * @see org.apache.activemq.api.core.client.ClientProducer#send(org.apache.activemq.api.core.SimpleString, org.apache.activemq.api.core.Message, SendAcknowledgementHandler) + * @see org.apache.activemq.artemis.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) + * @see org.apache.activemq.artemis.api.core.client.ClientProducer#send(org.apache.activemq.artemis.api.core.SimpleString, org.apache.activemq.artemis.api.core.Message, SendAcknowledgementHandler) */ private final transient SendAcknowledgementHandler handler; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java index e844f7b4d1..2be77ebde1 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; public class SessionUniqueAddMetaDataMessage extends SessionAddMetaDataMessageV2 diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java index cd445a1205..d504110409 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.XidCodecSupport; /** * to be called after a failure on an XA Session diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXACommitMessage.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXACommitMessage.java index d32022ac2f..e35e8b9524 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXACommitMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.XidCodecSupport; public class SessionXACommitMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAEndMessage.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAEndMessage.java index 85bcd7ab98..abfbc5d500 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAEndMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.XidCodecSupport; public class SessionXAEndMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java similarity index 88% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java index 7742a1e65b..4f1357c55a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.XidCodecSupport; public class SessionXAForgetMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java index 1818019cc4..dbe36c91a8 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.util.ArrayList; import java.util.List; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.XidCodecSupport; public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java index 6a941987e0..525a98d78f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionXAGetTimeoutResponseMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java similarity index 88% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java index b7453cdc1c..2e39dfff79 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.XidCodecSupport; public class SessionXAJoinMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java similarity index 88% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java index e94bf57a1f..b2876737bc 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.XidCodecSupport; public class SessionXAPrepareMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java index 050924a10a..a6901376bd 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionXAResponseMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java similarity index 89% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java index 126c1635b2..6877d75f4b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.XidCodecSupport; public class SessionXAResumeMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java similarity index 89% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java index 26084c0576..eaee3fdcd9 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.XidCodecSupport; public class SessionXARollbackMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java index 96be0d3072..045f5aa89f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionXASetTimeoutMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java index 79e79c8edb..5b566869b2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SessionXASetTimeoutResponseMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java index 040e85c797..176f550bf7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.utils.XidCodecSupport; public class SessionXAStartMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java index 0fabed89e8..b5cb36c80f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class SubscribeClusterTopologyUpdatesMessage extends PacketImpl { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java index b87f7ce6a3..ae28f560af 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; public class SubscribeClusterTopologyUpdatesMessageV2 extends SubscribeClusterTopologyUpdatesMessage { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/CloseListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CloseListener.java similarity index 79% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/CloseListener.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CloseListener.java index 7ee2284a59..7316d0ab7f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/CloseListener.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CloseListener.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting; +package org.apache.activemq.artemis.core.remoting; /** - * CloseListeners can be registered with a {@link org.apache.activemq.spi.core.protocol.RemotingConnection} to get notified when the connection is closed. + * CloseListeners can be registered with a {@link org.apache.activemq.artemis.spi.core.protocol.RemotingConnection} to get notified when the connection is closed. *

- * {@link org.apache.activemq.spi.core.protocol.RemotingConnection#addCloseListener(CloseListener)} + * {@link org.apache.activemq.artemis.spi.core.protocol.RemotingConnection#addCloseListener(CloseListener)} */ public interface CloseListener { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/FailureListener.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/FailureListener.java index 8386ec8e74..0fbfda28f7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/FailureListener.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting; +package org.apache.activemq.artemis.core.remoting; -import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQException; /** * A FailureListener notifies the user when a connection failure occurred. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/TransportConfigurationUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/TransportConfigurationUtil.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/TransportConfigurationUtil.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/TransportConfigurationUtil.java index 1a72026e45..062592ae04 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/TransportConfigurationUtil.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/TransportConfigurationUtil.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl; +package org.apache.activemq.artemis.core.remoting.impl; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.api.core.TransportConfigurationHelper; -import org.apache.activemq.utils.ClassloadingUtil; +import org.apache.activemq.artemis.api.core.TransportConfigurationHelper; +import org.apache.activemq.artemis.utils.ClassloadingUtil; /** * Stores static mappings of class names to ConnectorFactory instances to act as a central repo for ConnectorFactory diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQAMQPFrameDecoder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQAMQPFrameDecoder.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQAMQPFrameDecoder.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQAMQPFrameDecoder.java index 2a1ce73c1b..e45f720608 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQAMQPFrameDecoder.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQAMQPFrameDecoder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQChannelHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQChannelHandler.java similarity index 87% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQChannelHandler.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQChannelHandler.java index ae16a17272..cf396eb67c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQChannelHandler.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQChannelHandler.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.group.ChannelGroup; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; /** diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQFrameDecoder2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQFrameDecoder2.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQFrameDecoder2.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQFrameDecoder2.java index 745951a43e..315a3eb696 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQFrameDecoder2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ActiveMQFrameDecoder2.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.utils.DataConstants; /** * A Netty decoder specially optimised to to decode messages on the core protocol only diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java index 440305ddf7..aab710b375 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import java.net.SocketAddress; import java.util.Map; @@ -28,18 +28,18 @@ import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelPromise; import io.netty.channel.EventLoop; import io.netty.handler.ssl.SslHandler; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.security.ActiveMQPrincipal; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq.spi.core.remoting.ReadyListener; -import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.security.ActiveMQPrincipal; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.spi.core.remoting.ReadyListener; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; public class NettyConnection implements Connection { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java index 1ddb593786..df1a6f8a0f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; @@ -85,23 +85,23 @@ import io.netty.util.AttributeKey; import io.netty.util.ResourceLeakDetector; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GlobalEventExecutor; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq.core.protocol.core.impl.ActiveMQClientProtocolManager; -import org.apache.activemq.core.remoting.impl.ssl.SSLSupport; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.spi.core.remoting.AbstractConnector; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.ClientProtocolManager; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq.utils.ConfigurationHelper; -import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQClientProtocolManager; +import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.spi.core.remoting.AbstractConnector; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.utils.ConfigurationHelper; +import org.apache.activemq.artemis.utils.FutureLatch; -import static org.apache.activemq.utils.Base64.encodeBytes; +import static org.apache.activemq.artemis.utils.Base64.encodeBytes; public class NettyConnector extends AbstractConnector { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnectorFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnectorFactory.java similarity index 81% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnectorFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnectorFactory.java index b159b02985..a49f5bd365 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnectorFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnectorFactory.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.ClientProtocolManager; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq.spi.core.remoting.Connector; -import org.apache.activemq.spi.core.remoting.ConnectorFactory; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.spi.core.remoting.Connector; +import org.apache.activemq.artemis.spi.core.remoting.ConnectorFactory; public class NettyConnectorFactory implements ConnectorFactory { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/PartialPooledByteBufAllocator.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/PartialPooledByteBufAllocator.java index 83d6cb6208..a5a4742797 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/PartialPooledByteBufAllocator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/SharedNioEventLoopGroup.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedNioEventLoopGroup.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/SharedNioEventLoopGroup.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedNioEventLoopGroup.java index ae125c4830..ed65b0155f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/SharedNioEventLoopGroup.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedNioEventLoopGroup.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.FutureListener; import io.netty.util.concurrent.ImmediateEventExecutor; import io.netty.util.concurrent.Promise; -import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq.utils.ActiveMQThreadFactory; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java index 1836ef358e..b7299ede51 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import java.util.Collections; import java.util.HashSet; import java.util.Set; import io.netty.util.Version; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; public class TransportConstants { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/ssl/SSLSupport.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/ssl/SSLSupport.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java index 7a50ff5467..ebdfcb5631 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/ssl/SSLSupport.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.ssl; +package org.apache.activemq.artemis.core.remoting.impl.ssl; import java.io.File; import java.io.IOException; @@ -32,7 +32,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; -import org.apache.activemq.utils.ClassloadingUtil; +import org.apache.activemq.artemis.utils.ClassloadingUtil; /** * Please note, this class supports PKCS#11 keystores, but there are no specific tests in the ActiveMQ test-suite to diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/package-info.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/package-info.java index 81305a118e..0347c5d088 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/package-info.java @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.core.management; +package org.apache.activemq.artemis.core.remoting; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/security/ActiveMQPrincipal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/security/ActiveMQPrincipal.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/security/ActiveMQPrincipal.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/security/ActiveMQPrincipal.java index 1b0f3868ba..d7b944f446 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/security/ActiveMQPrincipal.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/security/ActiveMQPrincipal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.security; +package org.apache.activemq.artemis.core.security; public class ActiveMQPrincipal { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/security/Role.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/security/Role.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/core/security/Role.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/security/Role.java index a56e414c21..ff397701d5 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/security/Role.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/security/Role.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.security; +package org.apache.activemq.artemis.core.security; import java.io.Serializable; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/server/QueueQueryResult.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/core/server/QueueQueryResult.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java index 4ed91904ea..52a81927a0 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/server/QueueQueryResult.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java @@ -14,9 +14,9 @@ * 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; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; public class QueueQueryResult { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/Notification.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/Notification.java similarity index 85% rename from activemq-core-client/src/main/java/org/apache/activemq/core/server/management/Notification.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/Notification.java index 43b0f1b9fb..d665e96c2a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/Notification.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/Notification.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.management; +package org.apache.activemq.artemis.core.server.management; -import org.apache.activemq.api.core.management.NotificationType; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.management.NotificationType; +import org.apache.activemq.artemis.utils.TypedProperties; /** * A Notification - * @see org.apache.activemq.core.server.management.NotificationListener + * @see org.apache.activemq.artemis.core.server.management.NotificationListener * @see NotificationType */ public final class Notification diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/NotificationListener.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationListener.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/NotificationListener.java index 0a16be708c..5ec34fde05 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationListener.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/NotificationListener.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.management; +package org.apache.activemq.artemis.core.server.management; public interface NotificationListener diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationService.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/NotificationService.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationService.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/NotificationService.java index a58a8c6ab5..3ebc952c65 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationService.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/management/NotificationService.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.management; +package org.apache.activemq.artemis.core.server.management; public interface NotificationService { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/settings/impl/AddressFullMessagePolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressFullMessagePolicy.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/core/settings/impl/AddressFullMessagePolicy.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressFullMessagePolicy.java index 485357af4a..64f85c8e3a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/settings/impl/AddressFullMessagePolicy.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressFullMessagePolicy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.settings.impl; +package org.apache.activemq.artemis.core.settings.impl; public enum AddressFullMessagePolicy { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/transaction/impl/XidImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/core/transaction/impl/XidImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java index 27c5e8e649..347e7fdeb5 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/transaction/impl/XidImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction.impl; +package org.apache.activemq.artemis.core.transaction.impl; import java.io.Serializable; import java.util.Arrays; import javax.transaction.xa.Xid; -import org.apache.activemq.utils.Base64; +import org.apache.activemq.artemis.utils.Base64; /** * Xid implementation diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/Version.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/Version.java index 797d200de5..6e20604a03 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/Version.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.version; +package org.apache.activemq.artemis.core.version; public interface Version { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java index ca5bcf615d..af1d48d9ea 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.version.impl; +package org.apache.activemq.artemis.core.version.impl; import java.io.Serializable; import java.util.Arrays; -import org.apache.activemq.core.version.Version; +import org.apache.activemq.artemis.core.version.Version; public class VersionImpl implements Version, Serializable { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/BytesMessageUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/BytesMessageUtil.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/reader/BytesMessageUtil.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/BytesMessageUtil.java index 8db73deebc..4222026f8b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/reader/BytesMessageUtil.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/BytesMessageUtil.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.reader; +package org.apache.activemq.artemis.reader; -import org.apache.activemq.api.core.Message; +import org.apache.activemq.artemis.api.core.Message; public class BytesMessageUtil extends MessageUtil { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MapMessageUtil.java similarity index 88% rename from activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MapMessageUtil.java index 6ea119e543..6b76c328e5 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MapMessageUtil.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.reader; +package org.apache.activemq.artemis.reader; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.utils.TypedProperties; public class MapMessageUtil extends MessageUtil { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java index 0b795f5d8d..92065ef826 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.reader; +package org.apache.activemq.artemis.reader; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQPropertyConversionException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; /** * static methods intended for import static on JMS like messages. @@ -196,6 +196,6 @@ public class MessageUtil { return message.containsProperty(new SimpleString(name)) || name.equals(MessageUtil.JMSXDELIVERYCOUNT) || MessageUtil.JMSXGROUPID.equals(name) && - message.containsProperty(org.apache.activemq.api.core.Message.HDR_GROUP_ID); + message.containsProperty(Message.HDR_GROUP_ID); } } diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/StreamMessageUtil.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/StreamMessageUtil.java index 5ad4b2a902..445a1d9382 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/StreamMessageUtil.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.reader; +package org.apache.activemq.artemis.reader; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.utils.DataConstants; public class StreamMessageUtil extends MessageUtil { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/TextMessageUtil.java similarity index 86% rename from activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/TextMessageUtil.java index dc9947b541..eae93ed1b4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/TextMessageUtil.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.reader; +package org.apache.activemq.artemis.reader; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; public class TextMessageUtil extends MessageUtil { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/package-info.java similarity index 94% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/package-info.java index ba13daa708..19dc30e751 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/package-info.java @@ -14,5 +14,4 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms; - +package org.apache.activemq.artemis.reader; \ No newline at end of file diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java similarity index 90% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java index 605e618115..b2132548d3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.protocol; +package org.apache.activemq.artemis.spi.core.protocol; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; -import org.apache.activemq.core.remoting.CloseListener; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.core.remoting.CloseListener; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.spi.core.remoting.Connection; public abstract class AbstractRemotingConnection implements RemotingConnection { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/ConnectionEntry.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ConnectionEntry.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/ConnectionEntry.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ConnectionEntry.java index 987b55a7fb..a2bf7a6f15 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/ConnectionEntry.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ConnectionEntry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.protocol; +package org.apache.activemq.artemis.spi.core.protocol; import java.util.concurrent.Executor; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java index 22527649c2..05aa2a50d6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.protocol; +package org.apache.activemq.artemis.spi.core.protocol; import java.util.List; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.remoting.CloseListener; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.remoting.CloseListener; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.Connection; /** * A RemotingConnection is a connection between a client and a server. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/AbstractConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/AbstractConnector.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/AbstractConnector.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/AbstractConnector.java index 101a355cac..5da71cede3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/AbstractConnector.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/AbstractConnector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; import java.util.Map; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferDecoder.java similarity index 84% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferDecoder.java index ebaf9fc72a..ab3cec9a81 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferDecoder.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; -import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; public interface BufferDecoder { /** - * called by the remoting system prior to {@link org.apache.activemq.spi.core.remoting.BufferHandler#bufferReceived(Object, org.apache.activemq.api.core.ActiveMQBuffer)}. + * called by the remoting system prior to {@link org.apache.activemq.artemis.spi.core.remoting.BufferHandler#bufferReceived(Object, ActiveMQBuffer)}. *

* The implementation should return true if there is enough data in the buffer to decode. otherwise false. * * @param buffer the buffer diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferHandler.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferHandler.java index 08c779b6ca..b918bbd972 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/BufferHandler.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; -import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; /** * A BufferHandler that will handle buffers received by an acceptor. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java similarity index 89% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java index 9958eb961f..f6278d2d89 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManager.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; import java.util.List; import java.util.concurrent.locks.Lock; import io.netty.channel.ChannelPipeline; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; public interface ClientProtocolManager { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManagerFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManagerFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java index 11717de748..89119122f6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManagerFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; public interface ClientProtocolManagerFactory { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connection.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connection.java index 8eeab9bdc4..e7b7147384 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connection.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; import io.netty.channel.ChannelFutureListener; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.security.ActiveMQPrincipal; -import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.security.ActiveMQPrincipal; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; /** * The connection used by a channel to write data to. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectionLifeCycleListener.java similarity index 92% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectionLifeCycleListener.java index 4ff1df1b58..f5935640ce 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectionLifeCycleListener.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; /** * A ConnectionLifeCycleListener is called by the remoting implementation to notify of connection events. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connector.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connector.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connector.java index c1569215bb..3d923121fe 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connector.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Connector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; import java.util.Map; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectorFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectorFactory.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectorFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectorFactory.java index d51f286935..d55564d57d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectorFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConnectorFactory.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.TransportConfigurationHelper; +import org.apache.activemq.artemis.api.core.TransportConfigurationHelper; /** * A ConnectorFactory is used by the client for creating connectors. *

- * A Connector is used to connect to an {@link org.apache.activemq.spi.core.remoting.Acceptor}. + * A Connector is used to connect to an {@link org.apache.activemq.artemis.spi.core.remoting.Acceptor}. */ public interface ConnectorFactory extends TransportConfigurationHelper { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConsumerContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConsumerContext.java similarity index 93% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConsumerContext.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConsumerContext.java index 82533be287..1ca8f6379f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConsumerContext.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ConsumerContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; public abstract class ConsumerContext { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ReadyListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ReadyListener.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ReadyListener.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ReadyListener.java index f5133cfb50..8d36ea0484 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ReadyListener.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ReadyListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; public interface ReadyListener { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java similarity index 87% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java index c642837b21..c6e88e2ce1 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; import javax.transaction.xa.XAException; import javax.transaction.xa.Xid; import java.util.HashMap; import java.util.concurrent.Executor; -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.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq.core.client.impl.ClientConsumerInternal; -import org.apache.activemq.core.client.impl.ClientLargeMessageInternal; -import org.apache.activemq.core.client.impl.ClientMessageInternal; -import org.apache.activemq.core.client.impl.ClientProducerCreditsImpl; -import org.apache.activemq.core.client.impl.ClientSessionInternal; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.utils.IDGenerator; -import org.apache.activemq.utils.SimpleIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal; +import org.apache.activemq.artemis.core.client.impl.ClientLargeMessageInternal; +import org.apache.activemq.artemis.core.client.impl.ClientMessageInternal; +import org.apache.activemq.artemis.core.client.impl.ClientProducerCreditsImpl; +import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.utils.IDGenerator; +import org.apache.activemq.artemis.utils.SimpleIDGenerator; public abstract class SessionContext { @@ -69,7 +69,7 @@ public abstract class SessionContext * * @param newConnection * @return true if it was possible to reattach - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ public abstract boolean reattachOnNewConnection(RemotingConnection newConnection) throws ActiveMQException; @@ -142,15 +142,13 @@ public abstract class SessionContext * * @param msgI * @return - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ public abstract int sendInitialChunkOnLargeMessage(MessageInternal msgI) throws ActiveMQException; public abstract int sendLargeMessageChunk(MessageInternal msgI, long messageBodySize, boolean sendBlocking, boolean lastChunk, byte[] chunk, SendAcknowledgementHandler messageHandler) throws ActiveMQException; - public abstract int sendServerLargeMessageChunk(MessageInternal msgI, long messageBodySize, boolean sendBlocking, boolean lastChunk, byte[] chunk, SendAcknowledgementHandler messageHandler) throws ActiveMQException; - public abstract void setSendAcknowledgementHandler(final SendAcknowledgementHandler handler); @@ -179,7 +177,7 @@ public abstract class SessionContext * this is because we only ACK after on the RA, We may review this if we always acked earlier. * * @param lastMessageAsDelivered - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ public abstract void simpleRollback(boolean lastMessageAsDelivered) throws ActiveMQException; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/TopologyResponseHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java similarity index 85% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/TopologyResponseHandler.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java index 3d9f903783..1748960c81 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/TopologyResponseHandler.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/TopologyResponseHandler.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; public interface TopologyResponseHandler { diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/package-info.java new file mode 100644 index 0000000000..6a793d6f4e --- /dev/null +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/package-info.java @@ -0,0 +1,18 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.artemis.spi.core.remoting; + diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractServerLocatorSchema.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractServerLocatorSchema.java similarity index 87% rename from activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractServerLocatorSchema.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractServerLocatorSchema.java index 91cf00bc90..bce0fead96 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractServerLocatorSchema.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractServerLocatorSchema.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.utils.uri.URISchema; import java.net.URI; import java.util.Map; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractTransportConfigurationSchema.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractTransportConfigurationSchema.java similarity index 85% rename from activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractTransportConfigurationSchema.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractTransportConfigurationSchema.java index d8d022f779..84df774786 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractTransportConfigurationSchema.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/AbstractTransportConfigurationSchema.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.utils.uri.URISchema; import java.util.List; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/ConnectionOptions.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectionOptions.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/uri/ConnectionOptions.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectionOptions.java index e27a47a44c..9b1cda1370 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/ConnectionOptions.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectionOptions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; /** * This will represent all the possible options you could setup on URLs * When parsing the URL this will serve as an intermediate object diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/ConnectorTransportConfigurationParser.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectorTransportConfigurationParser.java similarity index 82% rename from activemq-core-client/src/main/java/org/apache/activemq/uri/ConnectorTransportConfigurationParser.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectorTransportConfigurationParser.java index c28cad9bcd..68c47e2364 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/ConnectorTransportConfigurationParser.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ConnectorTransportConfigurationParser.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.utils.uri.URIFactory; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.utils.uri.URIFactory; import java.util.List; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/InVMServerLocatorSchema.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/InVMServerLocatorSchema.java similarity index 83% rename from activemq-core-client/src/main/java/org/apache/activemq/uri/InVMServerLocatorSchema.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/InVMServerLocatorSchema.java index 6010134bc5..cb57306f09 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/InVMServerLocatorSchema.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/InVMServerLocatorSchema.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.utils.uri.SchemaConstants; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.utils.uri.SchemaConstants; +import org.apache.activemq.artemis.utils.uri.URISchema; import java.net.URI; import java.net.URISyntaxException; @@ -37,7 +37,7 @@ public class InVMServerLocatorSchema extends AbstractServerLocatorSchema @Override protected ServerLocator internalNewObject(URI uri, Map query, String name) throws Exception { - TransportConfiguration tc = InVMTransportConfigurationSchema.createTransportConfiguration(uri, name, "org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"); + TransportConfiguration tc = InVMTransportConfigurationSchema.createTransportConfiguration(uri, name, "org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"); ServerLocator factory = ActiveMQClient.createServerLocatorWithoutHA(tc); return URISchema.setData(uri, factory, query); } diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/InVMTransportConfigurationSchema.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/InVMTransportConfigurationSchema.java similarity index 88% rename from activemq-core-client/src/main/java/org/apache/activemq/uri/InVMTransportConfigurationSchema.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/InVMTransportConfigurationSchema.java index 4d7b24ff84..a9ea8bc860 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/InVMTransportConfigurationSchema.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/InVMTransportConfigurationSchema.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.utils.uri.SchemaConstants; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.utils.uri.SchemaConstants; import java.net.URI; import java.util.ArrayList; @@ -49,7 +49,7 @@ public class InVMTransportConfigurationSchema extends AbstractTransportConfigura protected String getFactoryName() { - return "org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"; + return "org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"; } public static TransportConfiguration createTransportConfiguration(URI uri, String name, String factoryName) diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/JGroupsServerLocatorSchema.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/JGroupsServerLocatorSchema.java similarity index 81% rename from activemq-core-client/src/main/java/org/apache/activemq/uri/JGroupsServerLocatorSchema.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/JGroupsServerLocatorSchema.java index 7dd7e48cef..0d8ae33004 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/JGroupsServerLocatorSchema.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/JGroupsServerLocatorSchema.java @@ -14,16 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.BroadcastEndpointFactory; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.JGroupsFileBroadcastEndpointFactory; -import org.apache.activemq.api.core.JGroupsPropertiesBroadcastEndpointFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.utils.uri.SchemaConstants; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.JGroupsFileBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.JGroupsPropertiesBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.utils.uri.SchemaConstants; import java.io.NotSerializableException; import java.net.URI; @@ -72,7 +71,7 @@ public class JGroupsServerLocatorSchema extends AbstractServerLocatorSchema { throw new NotSerializableException(endpoint + "not serializable"); } - String query = URISchema.getData(null, bean, dgc, endpoint); + String query = getData(null, bean, dgc, endpoint); dgc.setBroadcastEndpointFactory(endpoint); return new URI(SchemaConstants.JGROUPS, null, auth, -1, null, query, null); } @@ -89,11 +88,11 @@ public class JGroupsServerLocatorSchema extends AbstractServerLocatorSchema endpointFactory = new JGroupsPropertiesBroadcastEndpointFactory().setChannelName(uri.getAuthority()); } - URISchema.setData(uri, endpointFactory, query); + setData(uri, endpointFactory, query); DiscoveryGroupConfiguration dcConfig = new DiscoveryGroupConfiguration().setName(name).setBroadcastEndpointFactory(endpointFactory); - URISchema.setData(uri, dcConfig, query); + setData(uri, dcConfig, query); return dcConfig; } } diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/ServerLocatorParser.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ServerLocatorParser.java similarity index 86% rename from activemq-core-client/src/main/java/org/apache/activemq/uri/ServerLocatorParser.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ServerLocatorParser.java index 2f67e26692..e83c9fb55b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/ServerLocatorParser.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/ServerLocatorParser.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.utils.uri.URIFactory; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.utils.uri.URIFactory; public class ServerLocatorParser extends URIFactory { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java similarity index 88% rename from activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java index 090bd8cfb9..a643d660bd 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.utils.uri.SchemaConstants; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.utils.uri.SchemaConstants; +import org.apache.activemq.artemis.utils.uri.URISchema; import java.net.URI; import java.util.List; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPTransportConfigurationSchema.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPTransportConfigurationSchema.java similarity index 91% rename from activemq-core-client/src/main/java/org/apache/activemq/uri/TCPTransportConfigurationSchema.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPTransportConfigurationSchema.java index 74ac3602da..2664bc9281 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPTransportConfigurationSchema.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPTransportConfigurationSchema.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq.utils.uri.SchemaConstants; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.utils.uri.SchemaConstants; +import org.apache.activemq.artemis.utils.uri.URISchema; import java.net.URI; import java.net.URISyntaxException; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/UDPServerLocatorSchema.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/UDPServerLocatorSchema.java similarity index 87% rename from activemq-core-client/src/main/java/org/apache/activemq/uri/UDPServerLocatorSchema.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/UDPServerLocatorSchema.java index 79e469c54f..d56707b514 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/UDPServerLocatorSchema.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/UDPServerLocatorSchema.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.UDPBroadcastEndpointFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.utils.uri.SchemaConstants; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.utils.uri.SchemaConstants; +import org.apache.activemq.artemis.utils.uri.URISchema; import java.net.URI; import java.util.ArrayList; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/ActiveMQBufferInputStream.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ActiveMQBufferInputStream.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/ActiveMQBufferInputStream.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ActiveMQBufferInputStream.java index 97acb32d66..55dbde7a83 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/ActiveMQBufferInputStream.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ActiveMQBufferInputStream.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 java.io.IOException; import java.io.InputStream; -import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; /** * Used to send large messages diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/BufferHelper.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/BufferHelper.java index 131394c9ec..678ef30491 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/BufferHelper.java @@ -14,10 +14,10 @@ * 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.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; /** * Helper methods to read and write from ActiveMQBuffer. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ConfigurationHelper.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ConfigurationHelper.java index 54eea5b2ad..6fe9b515ef 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ConfigurationHelper.java @@ -14,11 +14,11 @@ * 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.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.core.client.ActiveMQClientMessageBundle; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle; import java.util.HashSet; import java.util.Map; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfirmationWindowWarning.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ConfirmationWindowWarning.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/ConfirmationWindowWarning.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ConfirmationWindowWarning.java index 32f903c2d0..b1c1234f44 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfirmationWindowWarning.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ConfirmationWindowWarning.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.atomic.AtomicBoolean; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/DeflaterReader.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/DeflaterReader.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/DeflaterReader.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/DeflaterReader.java index 4f1b376b00..8de97a0203 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/DeflaterReader.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/DeflaterReader.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.IOException; import java.io.InputStream; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/ExecutorFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ExecutorFactory.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/ExecutorFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ExecutorFactory.java index 538fe9df41..b31e9612c3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/ExecutorFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ExecutorFactory.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; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/FutureLatch.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/FutureLatch.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/FutureLatch.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/FutureLatch.java index c52e1f26d9..2a1ada5aa6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/FutureLatch.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/FutureLatch.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.TimeUnit; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/IDGenerator.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/IDGenerator.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/IDGenerator.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/IDGenerator.java index 7579174d12..7a1cfbcf6b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/IDGenerator.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/IDGenerator.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; /** * Generator of record IDs for the journals. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterReader.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterReader.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.java index e4715f385e..3bbf05d2c5 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterReader.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.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.IOException; import java.io.InputStream; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterWriter.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterWriter.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterWriter.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterWriter.java index 8602234bb6..3133da526a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterWriter.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterWriter.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.IOException; import java.io.OutputStream; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/JNDIUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/JNDIUtil.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/JNDIUtil.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/JNDIUtil.java index ddc5fbf06b..7ec59b0d6d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/JNDIUtil.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/JNDIUtil.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.StringTokenizer; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedList.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/LinkedList.java similarity index 95% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedList.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/LinkedList.java index b24234a794..a39785ddd4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedList.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/LinkedList.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 LinkedList { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/LinkedListImpl.java similarity index 99% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/LinkedListImpl.java index 651086232a..483e84a0be 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/LinkedListImpl.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.Array; import java.util.NoSuchElementException; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListIterator.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/LinkedListIterator.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListIterator.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/LinkedListIterator.java index 612ecad41e..38ccbea3ca 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListIterator.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/LinkedListIterator.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.Iterator; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/MemorySize.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/MemorySize.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/MemorySize.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/MemorySize.java index 1230bcf3fd..d4206a8bf6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/MemorySize.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/MemorySize.java @@ -14,9 +14,9 @@ * 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.apache.activemq.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; import java.lang.ref.WeakReference; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/ObjectInputStreamWithClassLoader.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ObjectInputStreamWithClassLoader.java similarity index 99% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/ObjectInputStreamWithClassLoader.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ObjectInputStreamWithClassLoader.java index df36b4c1ca..eb0b97f3e7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/ObjectInputStreamWithClassLoader.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ObjectInputStreamWithClassLoader.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.IOException; import java.io.InputStream; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java index afba3bed09..038b3fbfd7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.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.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; /** diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedList.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/PriorityLinkedList.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedList.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/PriorityLinkedList.java index 7a83a37472..583e22e8d7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedList.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/PriorityLinkedList.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; /** diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedListImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/PriorityLinkedListImpl.java similarity index 99% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedListImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/PriorityLinkedListImpl.java index 9e5c753f76..0260671efe 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedListImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/PriorityLinkedListImpl.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.Array; import java.util.NoSuchElementException; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/Random.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/Random.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/Random.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/Random.java index 8f8a27b89c..fbbcd87905 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/Random.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/Random.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.Serializable; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/SecurityFormatter.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SecurityFormatter.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/SecurityFormatter.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SecurityFormatter.java index 05701789bc..bf4f976328 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/SecurityFormatter.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SecurityFormatter.java @@ -14,9 +14,9 @@ * 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.apache.activemq.core.security.Role; +import org.apache.activemq.artemis.core.security.Role; import java.util.ArrayList; import java.util.HashSet; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/SimpleIDGenerator.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SimpleIDGenerator.java similarity index 97% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/SimpleIDGenerator.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SimpleIDGenerator.java index 9a159d61a5..343718f2df 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/SimpleIDGenerator.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SimpleIDGenerator.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 class SimpleIDGenerator implements IDGenerator { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/SizeFormatterUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SizeFormatterUtil.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/SizeFormatterUtil.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SizeFormatterUtil.java index a8ad32152a..b112f40e91 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/SizeFormatterUtil.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SizeFormatterUtil.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 class SizeFormatterUtil { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/SoftValueHashMap.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueHashMap.java similarity index 98% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/SoftValueHashMap.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueHashMap.java index 00a1474496..1784eb3cf3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/SoftValueHashMap.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueHashMap.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.ref.ReferenceQueue; import java.lang.ref.SoftReference; @@ -28,7 +28,7 @@ import java.util.Set; import java.util.TreeSet; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; public class SoftValueHashMap implements Map { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/TimeAndCounterIDGenerator.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TimeAndCounterIDGenerator.java similarity index 99% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/TimeAndCounterIDGenerator.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TimeAndCounterIDGenerator.java index 318bcab5ba..59cbe55dc4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/TimeAndCounterIDGenerator.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TimeAndCounterIDGenerator.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.atomic.AtomicLong; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiter.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TokenBucketLimiter.java similarity index 96% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiter.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TokenBucketLimiter.java index 2934f8d31f..0c3b70335f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiter.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TokenBucketLimiter.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; /** * This class can throttle to a specific rate, using an algorithm based on the JSONString interface allows a toJSONString() diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONTokener.java similarity index 99% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONTokener.java index f1b93b3863..88b1e0389a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONTokener.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package org.apache.activemq.utils.json; +package org.apache.activemq.artemis.utils.json; import java.io.BufferedReader; import java.io.IOException; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/package-info.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/package-info.java index 0682d2d24b..4c50f81557 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/package-info.java @@ -14,5 +14,5 @@ * 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.utils; diff --git a/activemq-core-client/src/main/resources/activemq-version.properties b/artemis-core-client/src/main/resources/activemq-version.properties similarity index 100% rename from activemq-core-client/src/main/resources/activemq-version.properties rename to artemis-core-client/src/main/resources/activemq-version.properties diff --git a/activemq-core-client/src/test/java/org/apache/activemq/tests/CoreUnitTestCase.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/CoreUnitTestCase.java similarity index 96% rename from activemq-core-client/src/test/java/org/apache/activemq/tests/CoreUnitTestCase.java rename to artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/CoreUnitTestCase.java index 2d020f4bc9..3bdc561f2e 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/tests/CoreUnitTestCase.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/CoreUnitTestCase.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests; +package org.apache.activemq.artemis.tests; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; import org.junit.Assert; import org.junit.Rule; import org.junit.rules.TestRule; diff --git a/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/RandomUtil.java similarity index 93% rename from activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java rename to artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/RandomUtil.java index bbe6378548..25e68c96b4 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/RandomUtil.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests.util; +package org.apache.activemq.artemis.tests.util; import javax.transaction.xa.Xid; import java.util.Random; import java.util.UUID; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.transaction.impl.XidImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.transaction.impl.XidImpl; public final class RandomUtil { diff --git a/activemq-core-client/src/test/java/org/apache/activemq/tests/util/SilentTestCase.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/SilentTestCase.java similarity index 97% rename from activemq-core-client/src/test/java/org/apache/activemq/tests/util/SilentTestCase.java rename to artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/SilentTestCase.java index 1671e137f6..952a2c9087 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/tests/util/SilentTestCase.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/SilentTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests.util; +package org.apache.activemq.artemis.tests.util; import org.junit.Before; import org.junit.After; diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/CompressionUtilTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java similarity index 96% rename from activemq-core-client/src/test/java/org/apache/activemq/util/CompressionUtilTest.java rename to artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java index e83acf3ca7..98bc9c94e4 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/util/CompressionUtilTest.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.util; +package org.apache.activemq.artemis.util; import org.junit.Test; @@ -27,9 +27,9 @@ import java.util.zip.Deflater; import org.junit.Assert; -import org.apache.activemq.utils.DeflaterReader; -import org.apache.activemq.utils.InflaterReader; -import org.apache.activemq.utils.InflaterWriter; +import org.apache.activemq.artemis.utils.DeflaterReader; +import org.apache.activemq.artemis.utils.InflaterReader; +import org.apache.activemq.artemis.utils.InflaterWriter; public class CompressionUtilTest extends Assert { diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/ConcurrentHashSetTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java similarity index 94% rename from activemq-core-client/src/test/java/org/apache/activemq/util/ConcurrentHashSetTest.java rename to artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java index 288ec9137c..d10e432663 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/util/ConcurrentHashSetTest.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.util; +package org.apache.activemq.artemis.util; import org.junit.Before; import org.junit.After; @@ -25,9 +25,9 @@ import java.util.Iterator; import org.junit.Assert; -import org.apache.activemq.tests.util.RandomUtil; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.ConcurrentSet; +import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.ConcurrentSet; public class ConcurrentHashSetTest extends Assert { diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/TimeAndCounterIDGeneratorTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java similarity index 96% rename from activemq-core-client/src/test/java/org/apache/activemq/util/TimeAndCounterIDGeneratorTest.java rename to artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java index e09e486b4a..d97fafc81f 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/util/TimeAndCounterIDGeneratorTest.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.util; +package org.apache.activemq.artemis.util; import org.junit.Test; @@ -23,9 +23,9 @@ import java.util.concurrent.CountDownLatch; import org.junit.Assert; -import org.apache.activemq.tests.CoreUnitTestCase; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.TimeAndCounterIDGenerator; +import org.apache.activemq.artemis.tests.CoreUnitTestCase; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.TimeAndCounterIDGenerator; public class TimeAndCounterIDGeneratorTest extends Assert { diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java similarity index 97% rename from activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java rename to artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java index d1fd668add..df92491816 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.util; -import org.apache.activemq.api.core.ActiveMQPropertyConversionException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.tests.util.RandomUtil; -import org.apache.activemq.utils.TypedProperties; +package org.apache.activemq.artemis.util; +import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.apache.activemq.artemis.utils.TypedProperties; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesTest.java similarity index 96% rename from activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java rename to artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesTest.java index 99cb4151e5..e53be96d8d 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.util; +package org.apache.activemq.artemis.util; import java.util.Iterator; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.tests.util.RandomUtil; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.apache.activemq.artemis.utils.TypedProperties; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/XMLUtilTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java similarity index 64% rename from activemq-core-client/src/test/java/org/apache/activemq/util/XMLUtilTest.java rename to artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java index d84ff3a069..594bd02789 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/util/XMLUtilTest.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.util; +package org.apache.activemq.artemis.util; import org.junit.Test; import org.junit.Assert; -import org.apache.activemq.tests.util.SilentTestCase; -import org.apache.activemq.utils.XMLUtil; +import org.apache.activemq.artemis.tests.util.SilentTestCase; +import org.apache.activemq.artemis.utils.XMLUtil; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -37,9 +37,9 @@ public class XMLUtilTest extends SilentTestCase { String document = "foo"; - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(document); + Element e = XMLUtil.stringToElement(document); - Assert.assertEquals("foo", org.apache.activemq.utils.XMLUtil.getTextContent(e)); + Assert.assertEquals("foo", XMLUtil.getTextContent(e)); } @Test @@ -49,7 +49,7 @@ public class XMLUtilTest extends SilentTestCase Element e = XMLUtil.stringToElement(document); - Assert.assertEquals("foo", org.apache.activemq.utils.XMLUtil.getTextContent(e)); + Assert.assertEquals("foo", XMLUtil.getTextContent(e)); } @Test @@ -57,11 +57,11 @@ public class XMLUtilTest extends SilentTestCase { String document = ""; - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(document); + Element e = XMLUtil.stringToElement(document); - String s = org.apache.activemq.utils.XMLUtil.getTextContent(e); + String s = XMLUtil.getTextContent(e); - Element subelement = org.apache.activemq.utils.XMLUtil.stringToElement(s); + Element subelement = XMLUtil.stringToElement(s); Assert.assertEquals("a", subelement.getNodeName()); } @@ -71,11 +71,11 @@ public class XMLUtilTest extends SilentTestCase { String document = ""; - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(document); + Element e = XMLUtil.stringToElement(document); - String s = org.apache.activemq.utils.XMLUtil.getTextContent(e); + String s = XMLUtil.getTextContent(e); - Element subelement = org.apache.activemq.utils.XMLUtil.stringToElement(s); + Element subelement = XMLUtil.stringToElement(s); Assert.assertEquals("a", subelement.getNodeName()); } @@ -85,11 +85,11 @@ public class XMLUtilTest extends SilentTestCase { String document = ""; - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(document); + Element e = XMLUtil.stringToElement(document); - String s = org.apache.activemq.utils.XMLUtil.getTextContent(e); + String s = XMLUtil.getTextContent(e); - Element subelement = org.apache.activemq.utils.XMLUtil.stringToElement(s); + Element subelement = XMLUtil.stringToElement(s); Assert.assertEquals("a", subelement.getNodeName()); NodeList nl = subelement.getChildNodes(); @@ -113,7 +113,7 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), org.apache.activemq.utils.XMLUtil.stringToElement(s2)); + XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), XMLUtil.stringToElement(s2)); } @Test @@ -122,7 +122,7 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), org.apache.activemq.utils.XMLUtil.stringToElement(s2)); + XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), XMLUtil.stringToElement(s2)); } @Test @@ -133,8 +133,8 @@ public class XMLUtilTest extends SilentTestCase try { - org.apache.activemq.utils.XMLUtil.assertEquivalent(org.apache.activemq.utils.XMLUtil.stringToElement(s), - XMLUtil.stringToElement(s2)); + XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), + XMLUtil.stringToElement(s2)); Assert.fail("this should throw exception"); } catch (IllegalArgumentException e) @@ -149,8 +149,8 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - org.apache.activemq.utils.XMLUtil.assertEquivalent(org.apache.activemq.utils.XMLUtil.stringToElement(s), - org.apache.activemq.utils.XMLUtil.stringToElement(s2)); + XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), + XMLUtil.stringToElement(s2)); } @Test @@ -159,8 +159,8 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - org.apache.activemq.utils.XMLUtil.assertEquivalent(org.apache.activemq.utils.XMLUtil.stringToElement(s), - org.apache.activemq.utils.XMLUtil.stringToElement(s2)); + XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), + XMLUtil.stringToElement(s2)); } @Test @@ -169,8 +169,8 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - org.apache.activemq.utils.XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), - org.apache.activemq.utils.XMLUtil.stringToElement(s2)); + XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), + XMLUtil.stringToElement(s2)); } @Test @@ -181,8 +181,8 @@ public class XMLUtilTest extends SilentTestCase try { - org.apache.activemq.utils.XMLUtil.assertEquivalent(org.apache.activemq.utils.XMLUtil.stringToElement(s), - org.apache.activemq.utils.XMLUtil.stringToElement(s2)); + XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), + XMLUtil.stringToElement(s2)); Assert.fail("this should throw exception"); } catch (IllegalArgumentException e) @@ -198,25 +198,25 @@ public class XMLUtilTest extends SilentTestCase String s = ""; String s2 = ""; - org.apache.activemq.utils.XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), - org.apache.activemq.utils.XMLUtil.stringToElement(s2)); + XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), + XMLUtil.stringToElement(s2)); } @Test public void testElementToString_1() throws Exception { String s = "somethingelse"; - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(s); - String tostring = org.apache.activemq.utils.XMLUtil.elementToString(e); - Element convertedAgain = org.apache.activemq.utils.XMLUtil.stringToElement(tostring); - org.apache.activemq.utils.XMLUtil.assertEquivalent(e, convertedAgain); + Element e = XMLUtil.stringToElement(s); + String tostring = XMLUtil.elementToString(e); + Element convertedAgain = XMLUtil.stringToElement(tostring); + XMLUtil.assertEquivalent(e, convertedAgain); } @Test public void testElementToString_2() throws Exception { String s = ""; - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(s); + Element e = XMLUtil.stringToElement(s); String tostring = XMLUtil.elementToString(e); Element convertedAgain = XMLUtil.stringToElement(tostring); XMLUtil.assertEquivalent(e, convertedAgain); @@ -226,20 +226,20 @@ public class XMLUtilTest extends SilentTestCase public void testElementToString_3() throws Exception { String s = ""; - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(s); + Element e = XMLUtil.stringToElement(s); String tostring = XMLUtil.elementToString(e); - Element convertedAgain = org.apache.activemq.utils.XMLUtil.stringToElement(tostring); - org.apache.activemq.utils.XMLUtil.assertEquivalent(e, convertedAgain); + Element convertedAgain = XMLUtil.stringToElement(tostring); + XMLUtil.assertEquivalent(e, convertedAgain); } @Test public void testElementToString_4() throws Exception { String s = ""; - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(s); + Element e = XMLUtil.stringToElement(s); String tostring = XMLUtil.elementToString(e); - Element convertedAgain = org.apache.activemq.utils.XMLUtil.stringToElement(tostring); - org.apache.activemq.utils.XMLUtil.assertEquivalent(e, convertedAgain); + Element convertedAgain = XMLUtil.stringToElement(tostring); + XMLUtil.assertEquivalent(e, convertedAgain); } @Test @@ -261,7 +261,7 @@ public class XMLUtilTest extends SilentTestCase + ""; System.setProperty("sysprop1", "test1"); System.setProperty("sysprop2", "content4"); - String replaced = org.apache.activemq.utils.XMLUtil.replaceSystemProps(before); + String replaced = XMLUtil.replaceSystemProps(before); Assert.assertEquals(after, replaced); } diff --git a/activemq-dto/pom.xml b/artemis-dto/pom.xml similarity index 96% rename from activemq-dto/pom.xml rename to artemis-dto/pom.xml index 118f3556cb..69888fd759 100644 --- a/activemq-dto/pom.xml +++ b/artemis-dto/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-dto + artemis-dto jar ActiveMQ Artemis DTO @@ -34,7 +34,7 @@ org.apache.activemq - activemq-commons + artemis-commons ${project.version} diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/AppDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/AppDTO.java similarity index 96% rename from activemq-dto/src/main/java/org/apache/activemq/dto/AppDTO.java rename to artemis-dto/src/main/java/org/apache/activemq/artemis/dto/AppDTO.java index 5d1e043057..72bb47045c 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/AppDTO.java +++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/AppDTO.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.dto; +package org.apache.activemq.artemis.dto; import javax.xml.bind.annotation.XmlAccessType; diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BasicSecurityDTO.java similarity index 97% rename from activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java rename to artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BasicSecurityDTO.java index ee528ee5ab..f11c2d6731 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java +++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BasicSecurityDTO.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.dto; +package org.apache.activemq.artemis.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BrokerDTO.java similarity index 97% rename from activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java rename to artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BrokerDTO.java index a11d6b8901..ea14d87570 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java +++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BrokerDTO.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.dto; +package org.apache.activemq.artemis.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/ComponentDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ComponentDTO.java similarity index 96% rename from activemq-dto/src/main/java/org/apache/activemq/dto/ComponentDTO.java rename to artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ComponentDTO.java index 8fd9868e3d..b58d89c34b 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/ComponentDTO.java +++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ComponentDTO.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.dto; +package org.apache.activemq.artemis.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/SecurityDTO.java similarity index 96% rename from activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java rename to artemis-dto/src/main/java/org/apache/activemq/artemis/dto/SecurityDTO.java index 723f92d01a..e4308d475f 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java +++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/SecurityDTO.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.dto; +package org.apache.activemq.artemis.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/ServerDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ServerDTO.java similarity index 96% rename from activemq-dto/src/main/java/org/apache/activemq/dto/ServerDTO.java rename to artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ServerDTO.java index 9ef2168823..0595dab45b 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/ServerDTO.java +++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ServerDTO.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.dto; +package org.apache.activemq.artemis.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/WebServerDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/WebServerDTO.java similarity index 91% rename from activemq-dto/src/main/java/org/apache/activemq/dto/WebServerDTO.java rename to artemis-dto/src/main/java/org/apache/activemq/artemis/dto/WebServerDTO.java index 5875ac4f75..78ecbf9bd0 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/WebServerDTO.java +++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/WebServerDTO.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.dto; +package org.apache.activemq.artemis.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -38,6 +38,6 @@ public class WebServerDTO extends ComponentDTO public WebServerDTO() { - componentClassName = "org.apache.activemq.component.WebServerComponent"; + componentClassName = "org.apache.activemq.artemis.component.WebServerComponent"; } } diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/XmlUtil.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java similarity index 98% rename from activemq-dto/src/main/java/org/apache/activemq/dto/XmlUtil.java rename to artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java index 5f9db1fc61..7596cb3d70 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/XmlUtil.java +++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.dto; +package org.apache.activemq.artemis.dto; import javax.xml.XMLConstants; import javax.xml.bind.JAXBContext; @@ -86,7 +86,7 @@ public class XmlUtil public static T decode(Class clazz, File configuration) throws Exception { - JAXBContext jaxbContext = JAXBContext.newInstance("org.apache.activemq.dto"); + JAXBContext jaxbContext = JAXBContext.newInstance("org.apache.activemq.artemis.dto"); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/package-info.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java similarity index 96% rename from activemq-dto/src/main/java/org/apache/activemq/dto/package-info.java rename to artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java index cb303af3ac..7752e27890 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/package-info.java +++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java @@ -20,4 +20,4 @@ @javax.xml.bind.annotation.XmlSchema( namespace = "http://activemq.org/schema", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.apache.activemq.dto; +package org.apache.activemq.artemis.dto; diff --git a/activemq-dto/src/main/resources/org/apache/activemq/dto/jaxb.index b/artemis-dto/src/main/resources/org/apache/activemq/artemis/dto/jaxb.index similarity index 100% rename from activemq-dto/src/main/resources/org/apache/activemq/dto/jaxb.index rename to artemis-dto/src/main/resources/org/apache/activemq/artemis/dto/jaxb.index diff --git a/activemq-jms-client/pom.xml b/artemis-jms-client/pom.xml similarity index 89% rename from activemq-jms-client/pom.xml rename to artemis-jms-client/pom.xml index e683ecb446..e448927892 100644 --- a/activemq-jms-client/pom.xml +++ b/artemis-jms-client/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-jms-client + artemis-jms-client jar ActiveMQ Artemis JMS Client @@ -40,14 +40,14 @@ org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} test test-jar org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} @@ -82,7 +82,7 @@ 512m false true - org.apache.activemq.core:org.apache.activemq.utils + org.apache.activemq.artemis.core:org.apache.activemq.artemis.utils diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/ActiveMQJMSClient.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java similarity index 91% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/ActiveMQJMSClient.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java index 3e763b9617..0ce6e81c0f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/ActiveMQJMSClient.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms; +package org.apache.activemq.artemis.api.jms; import javax.jms.Queue; import javax.jms.Topic; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQQueueConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQTopicConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQXAConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQXAQueueConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQXATopicConnectionFactory; -import org.apache.activemq.uri.ConnectionFactoryParser; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQQueueConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQTopicConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQXAQueueConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQXATopicConnectionFactory; +import org.apache.activemq.artemis.uri.ConnectionFactoryParser; /** * A utility class for creating ActiveMQ client-side JMS managed resources. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/ActiveMQJMSConstants.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java similarity index 97% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/ActiveMQJMSConstants.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java index 104645f8a0..fb5160846b 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/ActiveMQJMSConstants.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms; +package org.apache.activemq.artemis.api.jms; /** * Constants for ActiveMQ for property keys used for ActiveMQ specific extensions to JMS. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/JMSFactoryType.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java similarity index 97% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/JMSFactoryType.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java index 8199f46750..67a3126ddb 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/JMSFactoryType.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms; +package org.apache.activemq.artemis.api.jms; // XXX no javadocs public enum JMSFactoryType diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java similarity index 51% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java index 04c6fd497d..5046f87dd0 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms.management; +package org.apache.activemq.artemis.api.jms.management; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.management.Operation; -import org.apache.activemq.api.core.management.Parameter; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.management.Operation; +import org.apache.activemq.artemis.api.core.management.Parameter; /** * A ConnectionFactoryControl is used to manage a JMS ConnectionFactory.
* ActiveMQ JMS ConnectionFactory uses an underlying ClientSessionFactory to connect to ActiveMQ * servers. Please refer to the ClientSessionFactory for a detailed description. * - * @see ServerLocator - * @see ClientSessionFactory + * @see org.apache.activemq.artemis.api.core.client.ServerLocator + * @see org.apache.activemq.artemis.api.core.client.ClientSessionFactory */ public interface ConnectionFactoryControl { @@ -67,39 +67,39 @@ public interface ConnectionFactoryControl /** * @return whether large messages are compressed - * @see ServerLocator#isCompressLargeMessage() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#isCompressLargeMessage() */ boolean isCompressLargeMessages(); void setCompressLargeMessages(boolean compress); /** - * @see ServerLocator#getClientFailureCheckPeriod() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getClientFailureCheckPeriod() */ long getClientFailureCheckPeriod(); /** - * @see ServerLocator#setClientFailureCheckPeriod + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setClientFailureCheckPeriod */ void setClientFailureCheckPeriod(long clientFailureCheckPeriod); /** - * @see ServerLocator#getCallTimeout() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getCallTimeout() */ long getCallTimeout(); /** - * @see ServerLocator#setCallTimeout(long) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setCallTimeout(long) */ void setCallTimeout(long callTimeout); /** - * @see ServerLocator#getCallFailoverTimeout() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getCallFailoverTimeout() */ long getCallFailoverTimeout(); /** - * @see ServerLocator#setCallFailoverTimeout(long) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setCallFailoverTimeout(long) */ void setCallFailoverTimeout(long callTimeout); @@ -108,267 +108,267 @@ public interface ConnectionFactoryControl * Returns the batch size (in bytes) between acknowledgements when using DUPS_OK_ACKNOWLEDGE * mode. * - * @see ServerLocator#getAckBatchSize() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getAckBatchSize() * @see javax.jms.Session#DUPS_OK_ACKNOWLEDGE */ int getDupsOKBatchSize(); /** - * @see ServerLocator#setAckBatchSize(int) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setAckBatchSize(int) */ void setDupsOKBatchSize(int dupsOKBatchSize); /** - * @see ServerLocator#getConsumerMaxRate() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getConsumerMaxRate() */ int getConsumerMaxRate(); /** - * @see ServerLocator#setConsumerMaxRate(int) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setConsumerMaxRate(int) */ void setConsumerMaxRate(int consumerMaxRate); /** - * @see ServerLocator#getConsumerWindowSize() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getConsumerWindowSize() */ int getConsumerWindowSize(); /** - * @see ServerLocator#setConfirmationWindowSize(int) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setConfirmationWindowSize(int) */ void setConsumerWindowSize(int consumerWindowSize); /** - * @see ServerLocator#getProducerMaxRate() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getProducerMaxRate() */ int getProducerMaxRate(); /** - * @see ServerLocator#setProducerMaxRate(int) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setProducerMaxRate(int) */ void setProducerMaxRate(int producerMaxRate); /** - * @see ServerLocator#getConfirmationWindowSize() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getConfirmationWindowSize() */ int getConfirmationWindowSize(); /** - * @see ServerLocator#setConfirmationWindowSize(int) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setConfirmationWindowSize(int) */ void setConfirmationWindowSize(int confirmationWindowSize); /** - * @see ServerLocator#isBlockOnAcknowledge() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#isBlockOnAcknowledge() */ boolean isBlockOnAcknowledge(); /** - * @see ServerLocator#setBlockOnAcknowledge(boolean) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setBlockOnAcknowledge(boolean) */ void setBlockOnAcknowledge(boolean blockOnAcknowledge); /** - * @see ServerLocator#isBlockOnDurableSend() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#isBlockOnDurableSend() */ boolean isBlockOnDurableSend(); /** - * @see ServerLocator#setBlockOnDurableSend(boolean) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setBlockOnDurableSend(boolean) */ void setBlockOnDurableSend(boolean blockOnDurableSend); /** - * @see ServerLocator#isBlockOnNonDurableSend() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#isBlockOnNonDurableSend() */ boolean isBlockOnNonDurableSend(); /** - * @see ServerLocator#setBlockOnNonDurableSend(boolean) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setBlockOnNonDurableSend(boolean) */ void setBlockOnNonDurableSend(boolean blockOnNonDurableSend); /** - * @see ServerLocator#isPreAcknowledge() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#isPreAcknowledge() */ boolean isPreAcknowledge(); /** - * @see ServerLocator#setPreAcknowledge(boolean) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setPreAcknowledge(boolean) */ void setPreAcknowledge(boolean preAcknowledge); /** - * @see ServerLocator#getConnectionTTL() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getConnectionTTL() */ long getConnectionTTL(); /** - * @see ServerLocator#setConnectionTTL(long) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setConnectionTTL(long) */ void setConnectionTTL(long connectionTTL); /** * Returns the batch size (in bytes) between acknowledgements when using a transacted session. * - * @see ServerLocator#getAckBatchSize() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getAckBatchSize() */ int getTransactionBatchSize(); /** - * @see ServerLocator#setAckBatchSize(int) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setAckBatchSize(int) */ void setTransactionBatchSize(int transactionBatchSize); /** - * @see ServerLocator#getMinLargeMessageSize() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getMinLargeMessageSize() */ int getMinLargeMessageSize(); /** - * @see ServerLocator#setMinLargeMessageSize(int) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setMinLargeMessageSize(int) */ void setMinLargeMessageSize(int minLargeMessageSize); /** - * @see ServerLocator#isAutoGroup() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#isAutoGroup() */ boolean isAutoGroup(); /** - * @see ServerLocator#setAutoGroup(boolean) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setAutoGroup(boolean) */ void setAutoGroup(boolean autoGroup); /** - * @see ServerLocator#getRetryInterval() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getRetryInterval() */ long getRetryInterval(); /** - * @see ServerLocator#setRetryInterval(long) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setRetryInterval(long) */ void setRetryInterval(long retryInterval); /** - * @see ServerLocator#getRetryIntervalMultiplier() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getRetryIntervalMultiplier() */ double getRetryIntervalMultiplier(); /** - * @see ServerLocator#setRetryIntervalMultiplier(double) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setRetryIntervalMultiplier(double) */ void setRetryIntervalMultiplier(double retryIntervalMultiplier); /** - * @see ServerLocator#getReconnectAttempts() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getReconnectAttempts() */ int getReconnectAttempts(); /** - * @see ServerLocator#setReconnectAttempts(int) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setReconnectAttempts(int) */ void setReconnectAttempts(int reconnectAttempts); /** - * @see ServerLocator#isFailoverOnInitialConnection() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#isFailoverOnInitialConnection() */ boolean isFailoverOnInitialConnection(); /** - * @see ServerLocator#setFailoverOnInitialConnection(boolean) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setFailoverOnInitialConnection(boolean) */ void setFailoverOnInitialConnection(boolean failoverOnInitialConnection); /** - * @see org.apache.activemq.api.core.client.ServerLocator#getProducerWindowSize() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getProducerWindowSize() */ int getProducerWindowSize(); /** - * @see ServerLocator#setProducerWindowSize(int) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setProducerWindowSize(int) */ void setProducerWindowSize(int producerWindowSize); /** - * @see ServerLocator#isCacheLargeMessagesClient() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#isCacheLargeMessagesClient() */ boolean isCacheLargeMessagesClient(); /** - * @see ServerLocator#setCacheLargeMessagesClient(boolean) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setCacheLargeMessagesClient(boolean) */ void setCacheLargeMessagesClient(boolean cacheLargeMessagesClient); /** - * @see ServerLocator#getMaxRetryInterval() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getMaxRetryInterval() */ long getMaxRetryInterval(); /** - * @see ServerLocator#setMaxRetryInterval(long) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setMaxRetryInterval(long) */ void setMaxRetryInterval(long retryInterval); /** - * @see ServerLocator#getScheduledThreadPoolMaxSize() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getScheduledThreadPoolMaxSize() */ int getScheduledThreadPoolMaxSize(); /** - * @see ServerLocator#setScheduledThreadPoolMaxSize(int) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setScheduledThreadPoolMaxSize(int) */ void setScheduledThreadPoolMaxSize(int scheduledThreadPoolMaxSize); /** - * @see ServerLocator#getThreadPoolMaxSize() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getThreadPoolMaxSize() */ int getThreadPoolMaxSize(); /** - * @see ServerLocator#setThreadPoolMaxSize(int) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setThreadPoolMaxSize(int) */ void setThreadPoolMaxSize(int threadPoolMaxSize); /** - * @see ServerLocator#getGroupID() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getGroupID() */ String getGroupID(); /** - * @see ServerLocator#setGroupID(String) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setGroupID(String) */ void setGroupID(String groupID); /** - * @see ServerLocator#getInitialMessagePacketSize() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getInitialMessagePacketSize() */ int getInitialMessagePacketSize(); /** - * @see ServerLocator#isUseGlobalPools() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#isUseGlobalPools() */ boolean isUseGlobalPools(); /** - * @see ServerLocator#setUseGlobalPools(boolean) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setUseGlobalPools(boolean) */ void setUseGlobalPools(boolean useGlobalPools); /** - * @see ServerLocator#getConnectionLoadBalancingPolicyClassName() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getConnectionLoadBalancingPolicyClassName() */ String getConnectionLoadBalancingPolicyClassName(); /** - * @see ServerLocator#setConnectionLoadBalancingPolicyClassName(String) + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#setConnectionLoadBalancingPolicyClassName(String) */ void setConnectionLoadBalancingPolicyClassName(String connectionLoadBalancingPolicyClassName); /** - * @see ClientSessionFactory#getStaticConnectors() + * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getStaticTransportConfigurations() */ TransportConfiguration[] getStaticConnectors(); diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/DestinationControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java similarity index 92% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/DestinationControl.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java index 0640d1757d..7ee35a0c02 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/DestinationControl.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms.management; +package org.apache.activemq.artemis.api.jms.management; import javax.management.MBeanOperationInfo; -import org.apache.activemq.api.core.management.Operation; -import org.apache.activemq.api.core.management.Parameter; +import org.apache.activemq.artemis.api.core.management.Operation; +import org.apache.activemq.artemis.api.core.management.Parameter; /** * A DestinationControl is used to manage a JMS Destination. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConnectionInfo.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConnectionInfo.java similarity index 94% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConnectionInfo.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConnectionInfo.java index c25fd27846..38a2abab1f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConnectionInfo.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConnectionInfo.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms.management; +package org.apache.activemq.artemis.api.jms.management; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; public class JMSConnectionInfo { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConsumerInfo.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConsumerInfo.java similarity index 95% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConsumerInfo.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConsumerInfo.java index 40001cb6c3..509b179bf8 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSConsumerInfo.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConsumerInfo.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms.management; +package org.apache.activemq.artemis.api.jms.management; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; /** * Helper class to create Java Objects from the diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSManagementHelper.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java similarity index 92% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSManagementHelper.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java index 6190ea5ec7..4bf6007f76 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSManagementHelper.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms.management; +package org.apache.activemq.artemis.api.jms.management; import javax.jms.JMSException; import javax.jms.Message; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.jms.client.ActiveMQMessage; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.jms.client.ActiveMQMessage; /** * Helper class to use JMS messages to manage ActiveMQ server resources. */ public class JMSManagementHelper { - private static org.apache.activemq.api.core.Message getCoreMessage(final Message jmsMessage) + private static org.apache.activemq.artemis.api.core.Message getCoreMessage(final Message jmsMessage) { if (jmsMessage instanceof ActiveMQMessage == false) { @@ -46,7 +46,7 @@ public class JMSManagementHelper * @param attribute the name of the attribute * @throws JMSException if an exception occurs while putting the information in the message * - * @see org.apache.activemq.api.core.management.ResourceNames + * @see org.apache.activemq.artemis.api.core.management.ResourceNames */ public static void putAttribute(final Message message, final String resourceName, final String attribute) throws JMSException { @@ -61,7 +61,7 @@ public class JMSManagementHelper * @param operationName the name of the operation to invoke on the resource * @throws JMSException if an exception occurs while putting the information in the message * - * @see org.apache.activemq.api.core.management.ResourceNames + * @see org.apache.activemq.artemis.api.core.management.ResourceNames */ public static void putOperationInvocation(final Message message, final String resourceName, @@ -97,7 +97,7 @@ public class JMSManagementHelper * @param parameters the parameters to use to invoke the server resource * @throws JMSException if an exception occurs while putting the information in the message * - * @see org.apache.activemq.api.core.management.ResourceNames + * @see org.apache.activemq.artemis.api.core.management.ResourceNames */ public static void putOperationInvocation(final Message message, final String resourceName, diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java similarity index 98% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java index 586f5c292f..a128d839a8 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms.management; +package org.apache.activemq.artemis.api.jms.management; import java.util.Map; import javax.management.MBeanOperationInfo; -import org.apache.activemq.api.core.management.Operation; -import org.apache.activemq.api.core.management.Parameter; +import org.apache.activemq.artemis.api.core.management.Operation; +import org.apache.activemq.artemis.api.core.management.Parameter; /** * A JMSQueueControl is used to manage a JMS queue. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSServerControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java similarity index 98% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSServerControl.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java index 56297eef00..739f6479ad 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSServerControl.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms.management; +package org.apache.activemq.artemis.api.jms.management; import javax.management.MBeanOperationInfo; -import org.apache.activemq.api.core.management.Operation; -import org.apache.activemq.api.core.management.Parameter; +import org.apache.activemq.artemis.api.core.management.Operation; +import org.apache.activemq.artemis.api.core.management.Parameter; /** * A JMSSserverControl is used to manage ActiveMQ JMS server. @@ -148,8 +148,8 @@ public interface JMSServerControl * The ConnectionFactory is bound to JNDI for all the specified bindings Strings. *
* {@code liveConnectorsTransportClassNames} are the class names - * of the {@link org.apache.activemq.spi.core.remoting.ConnectorFactory} to connect to the live servers - * and {@code liveConnectorTransportParams} are Map<String, Object> for the corresponding {@link org.apache.activemq.api.core.TransportConfiguration}'s parameters. + * of the {@link org.apache.activemq.artemis.spi.core.remoting.ConnectorFactory} to connect to the live servers + * and {@code liveConnectorTransportParams} are Map<String, Object> for the corresponding {@link org.apache.activemq.artemis.api.core.TransportConfiguration}'s parameters. */ void createConnectionFactory(String name, boolean ha, diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSSessionInfo.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSSessionInfo.java similarity index 88% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSSessionInfo.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSSessionInfo.java index baf2b19f89..7e76c7b9a8 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSSessionInfo.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSSessionInfo.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms.management; +package org.apache.activemq.artemis.api.jms.management; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONException; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONException; +import org.apache.activemq.artemis.utils.json.JSONObject; public class JMSSessionInfo { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/SubscriptionInfo.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java similarity index 96% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/SubscriptionInfo.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java index 578ba32566..131f001d48 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/SubscriptionInfo.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms.management; +package org.apache.activemq.artemis.api.jms.management; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; /** * Helper class to create Java Objects from the diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/TopicControl.java similarity index 97% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/TopicControl.java index 917a75bd9b..c19bcfbf64 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/TopicControl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.api.jms.management; +package org.apache.activemq.artemis.api.jms.management; import java.util.Map; import javax.management.MBeanOperationInfo; -import org.apache.activemq.api.core.management.Operation; -import org.apache.activemq.api.core.management.Parameter; +import org.apache.activemq.artemis.api.core.management.Operation; +import org.apache.activemq.artemis.api.core.management.Parameter; /** * A TopicControl is used to manage a JMS Topic. diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/package-info.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/package-info.java new file mode 100644 index 0000000000..01539a64d7 --- /dev/null +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/package-info.java @@ -0,0 +1,18 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.artemis.api.jms.management; + diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/package-info.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/package-info.java index 995b11d0e1..14e88b50f3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/package-info.java @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting; +package org.apache.activemq.artemis.api.jms; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQBytesMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java similarity index 79% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQBytesMessage.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java index 1506a2bd04..ed38b1c437 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQBytesMessage.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java @@ -14,44 +14,44 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.BytesMessage; import javax.jms.JMSException; import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; -import static org.apache.activemq.reader.BytesMessageUtil.bytesMessageReset; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadBoolean; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadByte; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadBytes; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadChar; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadDouble; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadFloat; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadInt; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadLong; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadShort; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUTF; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUnsignedByte; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUnsignedShort; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteBoolean; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteByte; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteBytes; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteChar; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteDouble; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteFloat; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteInt; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteLong; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteObject; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteShort; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteUTF; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesMessageReset; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadBoolean; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadByte; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadBytes; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadChar; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadDouble; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadFloat; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadInt; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadLong; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadShort; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadUTF; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadUnsignedByte; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadUnsignedShort; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteBoolean; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteByte; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteBytes; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteChar; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteDouble; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteFloat; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteInt; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteLong; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteObject; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteShort; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteUTF; /** * ActiveMQ implementation of a JMS {@link BytesMessage}. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnection.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java similarity index 95% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnection.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java index 49fdd4701a..282c6e646f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnection.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.ConnectionConsumer; import javax.jms.ConnectionMetaData; @@ -36,21 +36,21 @@ import java.lang.ref.WeakReference; import java.util.HashSet; import java.util.Set; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.FailoverEventListener; -import org.apache.activemq.api.core.client.FailoverEventType; -import org.apache.activemq.api.core.client.SessionFailureListener; -import org.apache.activemq.api.jms.ActiveMQJMSConstants; -import org.apache.activemq.core.client.impl.ClientSessionInternal; -import org.apache.activemq.core.version.Version; -import org.apache.activemq.reader.MessageUtil; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.UUIDGenerator; -import org.apache.activemq.utils.VersionLoader; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.FailoverEventListener; +import org.apache.activemq.artemis.api.core.client.FailoverEventType; +import org.apache.activemq.artemis.api.core.client.SessionFailureListener; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants; +import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; +import org.apache.activemq.artemis.core.version.Version; +import org.apache.activemq.artemis.reader.MessageUtil; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.UUIDGenerator; +import org.apache.activemq.artemis.utils.VersionLoader; /** * ActiveMQ implementation of a JMS Connection. @@ -79,9 +79,9 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme private final int connectionType; - private final Set sessions = new org.apache.activemq.utils.ConcurrentHashSet(); + private final Set sessions = new ConcurrentHashSet(); - private final Set tempQueues = new org.apache.activemq.utils.ConcurrentHashSet(); + private final Set tempQueues = new ConcurrentHashSet(); private final Set knownDestinations = new ConcurrentHashSet(); diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java similarity index 96% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionFactory.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java index 9aff17425b..1dd832757d 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionFactory.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -40,17 +40,17 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.net.URI; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.UDPBroadcastEndpointFactory; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.api.jms.JMSFactoryType; -import org.apache.activemq.jms.referenceable.ConnectionFactoryObjectFactory; -import org.apache.activemq.jms.referenceable.SerializableObjectRefAddr; -import org.apache.activemq.uri.ConnectionFactoryParser; -import org.apache.activemq.uri.ServerLocatorParser; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.jms.referenceable.ConnectionFactoryObjectFactory; +import org.apache.activemq.artemis.jms.referenceable.SerializableObjectRefAddr; +import org.apache.activemq.artemis.uri.ConnectionFactoryParser; +import org.apache.activemq.artemis.uri.ServerLocatorParser; /** * ActiveMQ implementation of a JMS ConnectionFactory. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionForContext.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionForContext.java similarity index 96% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionForContext.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionForContext.java index 6459011003..7a5fe7ac5c 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionForContext.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionForContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.JMSContext; import javax.jms.XAJMSContext; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionForContextImpl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionForContextImpl.java similarity index 91% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionForContextImpl.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionForContextImpl.java index 180cf7fa83..f1abea7ffc 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionForContextImpl.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionForContextImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.JMSContext; import javax.jms.JMSException; @@ -22,9 +22,9 @@ import javax.jms.JMSRuntimeException; import javax.jms.Session; import javax.jms.XAJMSContext; -import org.apache.activemq.api.jms.ActiveMQJMSConstants; -import org.apache.activemq.utils.ReferenceCounter; -import org.apache.activemq.utils.ReferenceCounterUtil; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants; +import org.apache.activemq.artemis.utils.ReferenceCounter; +import org.apache.activemq.artemis.utils.ReferenceCounterUtil; public abstract class ActiveMQConnectionForContextImpl implements ActiveMQConnectionForContext { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionMetaData.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java similarity index 96% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionMetaData.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java index 9a39fb2c97..21b0765c61 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionMetaData.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import java.util.Enumeration; import java.util.Vector; @@ -22,7 +22,7 @@ import java.util.Vector; import javax.jms.ConnectionMetaData; import javax.jms.JMSException; -import org.apache.activemq.core.version.Version; +import org.apache.activemq.artemis.core.version.Version; /** * ActiveMQ implementation of a JMS ConnectionMetaData. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQDestination.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java similarity index 97% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQDestination.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java index 0d2b31b856..f451baeeca 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQDestination.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import java.io.Serializable; import java.util.UUID; @@ -26,10 +26,10 @@ import javax.naming.NamingException; import javax.naming.Reference; import javax.naming.Referenceable; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.jms.referenceable.DestinationObjectFactory; -import org.apache.activemq.jms.referenceable.SerializableObjectRefAddr; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.jms.referenceable.DestinationObjectFactory; +import org.apache.activemq.artemis.jms.referenceable.SerializableObjectRefAddr; /** * ActiveMQ implementation of a JMS Destination. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java similarity index 92% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java index eb6802b917..a8950e56a1 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientBundle.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.IllegalStateException; @@ -25,10 +25,10 @@ import javax.jms.JMSRuntimeException; import javax.jms.MessageNotReadableException; import javax.jms.MessageNotWriteableException; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.api.core.ActiveMQInvalidFilterExpressionException; -import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.ActiveMQInvalidFilterExpressionException; +import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException; +import org.apache.activemq.artemis.api.core.SimpleString; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientLogger.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientLogger.java similarity index 98% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientLogger.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientLogger.java index 0584390724..61032c4cdf 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientLogger.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSClientLogger.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSConnectionFactory.java similarity index 87% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSConnectionFactory.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSConnectionFactory.java index 179b6b411b..6eebc2860a 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSConnectionFactory.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSConnectionFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.QueueConnectionFactory; import javax.jms.TopicConnectionFactory; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ServerLocator; /** diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSConsumer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSConsumer.java similarity index 99% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSConsumer.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSConsumer.java index b47fc5a1bd..bdceb7fe18 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSConsumer.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSConsumer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.JMSConsumer; import javax.jms.JMSException; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSContext.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java similarity index 99% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSContext.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java index de796c2a64..9cdbd15275 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSContext.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.BytesMessage; import javax.jms.ConnectionMetaData; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSProducer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSProducer.java similarity index 98% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSProducer.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSProducer.java index 9209920ce8..ee1afba607 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSProducer.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSProducer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.BytesMessage; import javax.jms.CompletionListener; @@ -37,9 +37,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.activemq.api.core.ActiveMQPropertyConversionException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.utils.TypedProperties; /** * NOTE: this class forwards {@link #setDisableMessageID(boolean)} and diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMapMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java similarity index 94% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMapMessage.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java index 0e127d3ff1..94cf695bb8 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMapMessage.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.JMSException; import javax.jms.MapMessage; @@ -24,17 +24,17 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQPropertyConversionException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.utils.TypedProperties; -import static org.apache.activemq.reader.MapMessageUtil.writeBodyMap; -import static org.apache.activemq.reader.MapMessageUtil.readBodyMap; +import static org.apache.activemq.artemis.reader.MapMessageUtil.writeBodyMap; +import static org.apache.activemq.artemis.reader.MapMessageUtil.readBodyMap; /** * ActiveMQ implementation of a JMS MapMessage. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java similarity index 95% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMessage.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java index 8a04d244af..41e4f43633 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMessage.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import java.io.InputStream; import java.io.ObjectInputStream; @@ -35,16 +35,16 @@ import javax.jms.Message; import javax.jms.MessageFormatException; import javax.jms.MessageNotWriteableException; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQPropertyConversionException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.jms.ActiveMQJMSConstants; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.reader.MessageUtil; -import org.apache.activemq.utils.UUID; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.reader.MessageUtil; +import org.apache.activemq.artemis.utils.UUID; /** @@ -56,7 +56,7 @@ import org.apache.activemq.utils.UUID; public class ActiveMQMessage implements javax.jms.Message { // Constants ----------------------------------------------------- - public static final byte TYPE = org.apache.activemq.api.core.Message.DEFAULT_TYPE; + public static final byte TYPE = org.apache.activemq.artemis.api.core.Message.DEFAULT_TYPE; public static Map coreMaptoJMSMap(final Map coreMessage) { @@ -635,7 +635,7 @@ public class ActiveMQMessage implements javax.jms.Message { if (MessageUtil.JMSXGROUPID.equals(name)) { - return message.getStringProperty(org.apache.activemq.api.core.Message.HDR_GROUP_ID); + return message.getStringProperty(org.apache.activemq.artemis.api.core.Message.HDR_GROUP_ID); } else { @@ -719,7 +719,7 @@ public class ActiveMQMessage implements javax.jms.Message if (MessageUtil.JMSXGROUPID.equals(name)) { - message.putStringProperty(org.apache.activemq.api.core.Message.HDR_GROUP_ID, SimpleString.toSimpleString(value)); + message.putStringProperty(org.apache.activemq.artemis.api.core.Message.HDR_GROUP_ID, SimpleString.toSimpleString(value)); } else { @@ -787,7 +787,7 @@ public class ActiveMQMessage implements javax.jms.Message Long value; try { - value = message.getLongProperty(org.apache.activemq.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME); + value = message.getLongProperty(org.apache.activemq.artemis.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME); } catch (Exception e) { @@ -807,7 +807,7 @@ public class ActiveMQMessage implements javax.jms.Message @Override public void setJMSDeliveryTime(long deliveryTime) throws JMSException { - message.putLongProperty(org.apache.activemq.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME, deliveryTime); + message.putLongProperty(org.apache.activemq.artemis.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME, deliveryTime); } @Override diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMessageConsumer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java similarity index 93% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMessageConsumer.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java index e673d9f1cc..95e14a59ad 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMessageConsumer.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.IllegalStateException; import javax.jms.JMSException; @@ -26,12 +26,12 @@ import javax.jms.Session; import javax.jms.Topic; import javax.jms.TopicSubscriber; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.MessageHandler; -import org.apache.activemq.api.jms.ActiveMQJMSConstants; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.MessageHandler; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants; /** * ActiveMQ implementation of a JMS MessageConsumer. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMessageProducer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java similarity index 96% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMessageProducer.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java index 94ff1c7160..050046e752 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQMessageProducer.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.BytesMessage; import javax.jms.CompletionListener; @@ -34,14 +34,14 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.jms.TopicPublisher; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq.utils.UUID; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.artemis.utils.UUID; +import org.apache.activemq.artemis.utils.UUIDGenerator; /** * ActiveMQ implementation of a JMS MessageProducer. */ @@ -559,7 +559,7 @@ public class ActiveMQMessageProducer implements MessageProducer, QueueSender, To } @Override - public void sendAcknowledged(org.apache.activemq.api.core.Message clientMessage) + public void sendAcknowledged(org.apache.activemq.artemis.api.core.Message clientMessage) { if (jmsMessage instanceof StreamMessage) { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQObjectMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java similarity index 92% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQObjectMessage.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java index 8229b4f4d8..16547f6ced 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQObjectMessage.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.JMSException; import javax.jms.MessageFormatException; @@ -25,10 +25,11 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.utils.ObjectInputStreamWithClassLoader; /** * ActiveMQ implementation of a JMS ObjectMessage. @@ -151,7 +152,7 @@ public class ActiveMQObjectMessage extends ActiveMQMessage implements ObjectMess try { ByteArrayInputStream bais = new ByteArrayInputStream(data); - ObjectInputStream ois = new org.apache.activemq.utils.ObjectInputStreamWithClassLoader(bais); + ObjectInputStream ois = new ObjectInputStreamWithClassLoader(bais); Serializable object = (Serializable)ois.readObject(); return object; } diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQQueue.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java similarity index 90% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQQueue.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java index 1bbf4257f5..47f7a9858f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQQueue.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.Queue; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; /** * ActiveMQ implementation of a JMS Queue. @@ -34,7 +34,7 @@ public class ActiveMQQueue extends ActiveMQDestination implements Queue public static SimpleString createAddressFromName(final String name) { - return new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + name); + return new SimpleString(JMS_QUEUE_ADDRESS_PREFIX + name); } // Attributes ---------------------------------------------------- @@ -43,7 +43,7 @@ public class ActiveMQQueue extends ActiveMQDestination implements Queue public ActiveMQQueue(final String name) { - super(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + name, name, false, true, null); + super(JMS_QUEUE_ADDRESS_PREFIX + name, name, false, true, null); } diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQQueueBrowser.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java similarity index 92% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQQueueBrowser.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java index e886197753..2a518d3791 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQQueueBrowser.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import java.util.Enumeration; import java.util.NoSuchElementException; @@ -23,11 +23,11 @@ import javax.jms.JMSException; import javax.jms.Queue; import javax.jms.QueueBrowser; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; /** * ActiveMQ implementation of a JMS QueueBrowser. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQQueueConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueConnectionFactory.java similarity index 85% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQQueueConnectionFactory.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueConnectionFactory.java index 2ae92093d5..7539749908 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQQueueConnectionFactory.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueConnectionFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.QueueConnectionFactory; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; /** * A class that represents a QueueConnectionFactory. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java similarity index 98% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQSession.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java index c409c27989..2bd5572573 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQSession.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import java.io.Serializable; import java.util.HashSet; @@ -49,16 +49,16 @@ import javax.jms.TopicSubscriber; import javax.jms.TransactionInProgressException; import javax.transaction.xa.XAResource; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQQueueExistsException; -import org.apache.activemq.selector.filter.FilterException; -import org.apache.activemq.selector.impl.SelectorParser; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSession.AddressQuery; -import org.apache.activemq.api.core.client.ClientSession.QueueQuery; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException; +import org.apache.activemq.artemis.selector.filter.FilterException; +import org.apache.activemq.artemis.selector.impl.SelectorParser; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSession.AddressQuery; +import org.apache.activemq.artemis.api.core.client.ClientSession.QueueQuery; /** * ActiveMQ implementation of a JMS Session. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQStreamMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java similarity index 88% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQStreamMessage.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java index eba8d438e7..d0a7345dbe 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQStreamMessage.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java @@ -14,32 +14,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.JMSException; import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; import javax.jms.StreamMessage; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.core.client.impl.ClientMessageImpl; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl; +import org.apache.activemq.artemis.utils.DataConstants; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadBoolean; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadByte; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadBytes; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadChar; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadDouble; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadFloat; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadInteger; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadLong; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadObject; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadShort; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadString; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadBoolean; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadByte; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadBytes; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadChar; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadDouble; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadFloat; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadInteger; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadLong; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadObject; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadShort; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadString; /** * ActiveMQ implementation of a JMS StreamMessage. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTemporaryQueue.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java similarity index 97% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTemporaryQueue.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java index 40fd9d142a..c06dd9a28f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTemporaryQueue.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.TemporaryQueue; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTemporaryTopic.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryTopic.java similarity index 97% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTemporaryTopic.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryTopic.java index d6dc0aa328..1fd39dc53f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTemporaryTopic.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryTopic.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.TemporaryTopic; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTextMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java similarity index 87% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTextMessage.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java index 38f571a223..e1c857e45a 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTextMessage.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.JMSException; import javax.jms.TextMessage; -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.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; -import static org.apache.activemq.reader.TextMessageUtil.readBodyText; -import static org.apache.activemq.reader.TextMessageUtil.writeBodyText; +import static org.apache.activemq.artemis.reader.TextMessageUtil.readBodyText; +import static org.apache.activemq.artemis.reader.TextMessageUtil.writeBodyText; /** diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTopic.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java similarity index 89% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTopic.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java index 19a416de53..9976b670b1 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTopic.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.Topic; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; /** * ActiveMQ implementation of a JMS Topic. @@ -34,7 +34,7 @@ public class ActiveMQTopic extends ActiveMQDestination implements Topic public static SimpleString createAddressFromName(final String name) { - return new SimpleString(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX + name); + return new SimpleString(JMS_TOPIC_ADDRESS_PREFIX + name); } // Attributes ---------------------------------------------------- @@ -43,7 +43,7 @@ public class ActiveMQTopic extends ActiveMQDestination implements Topic public ActiveMQTopic(final String name) { - super(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX + name, name, false, false, null); + super(JMS_TOPIC_ADDRESS_PREFIX + name, name, false, false, null); } diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTopicConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopicConnectionFactory.java similarity index 85% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTopicConnectionFactory.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopicConnectionFactory.java index d528b760c8..2ca873a36f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQTopicConnectionFactory.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopicConnectionFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.TopicConnectionFactory; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; /** * A class that represents a TopicConnectionFactory. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAConnection.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java similarity index 95% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAConnection.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java index a99c6c7e68..4e890a6ac8 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAConnection.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.JMSException; import javax.jms.Session; @@ -24,7 +24,7 @@ import javax.jms.XASession; import javax.jms.XATopicConnection; import javax.jms.XATopicSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; /** * ActiveMQ implementation of a JMS XAConnection. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnectionFactory.java similarity index 86% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAConnectionFactory.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnectionFactory.java index 3313917fa0..8e4920f393 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAConnectionFactory.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnectionFactory.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.XAQueueConnectionFactory; import javax.jms.XATopicConnectionFactory; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; /** * A class that represents a XAConnectionFactory. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAJMSContext.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAJMSContext.java similarity index 95% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAJMSContext.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAJMSContext.java index 8f6b2b1768..e7a4ae2c06 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAJMSContext.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAJMSContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.XAJMSContext; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAQueueConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAQueueConnectionFactory.java similarity index 85% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAQueueConnectionFactory.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAQueueConnectionFactory.java index 513c5fd549..0297f54f48 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXAQueueConnectionFactory.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAQueueConnectionFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.XAQueueConnectionFactory; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; /** * A class that represents a XAQueueConnectionFactory. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXASession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXASession.java similarity index 92% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXASession.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXASession.java index e17115d367..9e463d22f9 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXASession.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXASession.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.XAQueueSession; import javax.jms.XATopicSession; -import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSession; public class ActiveMQXASession extends ActiveMQSession implements XAQueueSession, XATopicSession { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXATopicConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXATopicConnectionFactory.java similarity index 85% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXATopicConnectionFactory.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXATopicConnectionFactory.java index 31e9d1033d..5edaf2a431 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQXATopicConnectionFactory.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXATopicConnectionFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.XATopicConnectionFactory; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; /** * A class that represents a XATopicConnectionFactory. diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSExceptionHelper.java similarity index 95% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSExceptionHelper.java index e3c023b4e0..0543deb0dc 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSExceptionHelper.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSExceptionHelper.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.InvalidDestinationException; import javax.jms.InvalidSelectorException; import javax.jms.JMSException; import javax.jms.JMSSecurityException; -import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQException; public final class JMSExceptionHelper { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSMessageListenerWrapper.java similarity index 91% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSMessageListenerWrapper.java index 578b656fa1..b56d4af091 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JMSMessageListenerWrapper.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSMessageListenerWrapper.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.MessageListener; import javax.jms.Session; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.MessageHandler; -import org.apache.activemq.api.jms.ActiveMQJMSConstants; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.MessageHandler; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants; public class JMSMessageListenerWrapper implements MessageHandler { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JmsExceptionUtils.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JmsExceptionUtils.java similarity index 98% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JmsExceptionUtils.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JmsExceptionUtils.java index a564d80394..cc2ca92475 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/JmsExceptionUtils.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JmsExceptionUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import javax.jms.IllegalStateRuntimeException; import javax.jms.InvalidClientIDException; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java similarity index 98% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java index 1c28bf1ae1..ebaf952749 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/SelectorTranslator.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; import java.util.ArrayList; import java.util.List; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ThreadAwareContext.java similarity index 98% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ThreadAwareContext.java index 3421e0cc53..8d2e0a5c38 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ThreadAwareContext.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ThreadAwareContext.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.client; +package org.apache.activemq.artemis.jms.client; -import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; import javax.jms.IllegalStateException; import java.util.Set; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/package-info.java similarity index 94% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/package-info.java index e0d1fdc5ee..09c4e66b41 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/package-info.java @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.jms.client; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java similarity index 96% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java index 252abb0550..7c95daae3f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/ConnectionFactoryObjectFactory.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.referenceable; +package org.apache.activemq.artemis.jms.referenceable; import java.util.Hashtable; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java similarity index 96% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java index f8dfc69d28..9065318f96 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/DestinationObjectFactory.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.referenceable; +package org.apache.activemq.artemis.jms.referenceable; import java.util.Hashtable; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/SerializableObjectRefAddr.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/SerializableObjectRefAddr.java similarity index 97% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/SerializableObjectRefAddr.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/SerializableObjectRefAddr.java index c41c698384..f078ccd9d7 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/referenceable/SerializableObjectRefAddr.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/SerializableObjectRefAddr.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.referenceable; +package org.apache.activemq.artemis.jms.referenceable; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java similarity index 97% rename from activemq-jms-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java index e14ff82219..dc6c85cd36 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jndi; +package org.apache.activemq.artemis.jndi; import javax.jms.ConnectionFactory; import javax.jms.Queue; @@ -27,8 +27,8 @@ import java.util.Iterator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq.api.jms.ActiveMQJMSClient; -import org.apache.activemq.uri.ConnectionFactoryParser; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.uri.ConnectionFactoryParser; /** * A factory of the ActiveMQ InitialContext which contains diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/LazyCreateContext.java similarity index 97% rename from activemq-jms-client/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/LazyCreateContext.java index 0fe51bcc1e..97095c905b 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jndi/LazyCreateContext.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/LazyCreateContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jndi; +package org.apache.activemq.artemis.jndi; import javax.naming.NameNotFoundException; import javax.naming.NamingException; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jndi/NameParserImpl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/NameParserImpl.java similarity index 96% rename from activemq-jms-client/src/main/java/org/apache/activemq/jndi/NameParserImpl.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/NameParserImpl.java index 8ae21cfebf..83b864236b 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jndi/NameParserImpl.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/NameParserImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jndi; +package org.apache.activemq.artemis.jndi; import javax.naming.CompositeName; import javax.naming.Name; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java similarity index 99% rename from activemq-jms-client/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java index 9602d1a2b0..8800249079 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jndi; +package org.apache.activemq.artemis.jndi; import java.io.Serializable; import java.util.Collections; @@ -37,7 +37,7 @@ import javax.naming.OperationNotSupportedException; import javax.naming.Reference; import javax.naming.spi.NamingManager; -import org.apache.activemq.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; /** * A read-only Context

This version assumes it and all its subcontext are diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/AbstractCFSchema.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/AbstractCFSchema.java similarity index 85% rename from activemq-jms-client/src/main/java/org/apache/activemq/uri/AbstractCFSchema.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/AbstractCFSchema.java index 026a96b16b..c30b07e3b3 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/AbstractCFSchema.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/AbstractCFSchema.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; import java.net.URI; import java.util.Map; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.utils.uri.URISchema; public abstract class AbstractCFSchema extends URISchema { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/ConnectionFactoryParser.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/ConnectionFactoryParser.java similarity index 86% rename from activemq-jms-client/src/main/java/org/apache/activemq/uri/ConnectionFactoryParser.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/ConnectionFactoryParser.java index 229060cdfa..3e9ad18296 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/ConnectionFactoryParser.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/ConnectionFactoryParser.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.utils.uri.URIFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.utils.uri.URIFactory; public class ConnectionFactoryParser extends URIFactory { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/InVMSchema.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/InVMSchema.java similarity index 81% rename from activemq-jms-client/src/main/java/org/apache/activemq/uri/InVMSchema.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/InVMSchema.java index 7d35118d74..366d7d0871 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/InVMSchema.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/InVMSchema.java @@ -14,12 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.jms.ActiveMQJMSClient; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.utils.uri.SchemaConstants; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.utils.uri.SchemaConstants; import java.net.URI; import java.util.Map; @@ -38,8 +37,8 @@ public class InVMSchema extends AbstractCFSchema JMSConnectionOptions options = newConectionOptions(uri, query); ActiveMQConnectionFactory factory = ActiveMQJMSClient.createConnectionFactoryWithoutHA(options.getFactoryTypeEnum(), - InVMTransportConfigurationSchema.createTransportConfiguration(uri, name, "org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory")); - return URISchema.setData(uri, factory, query); + InVMTransportConfigurationSchema.createTransportConfiguration(uri, name, "org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory")); + return setData(uri, factory, query); } @Override diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/JGroupsSchema.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/JGroupsSchema.java similarity index 81% rename from activemq-jms-client/src/main/java/org/apache/activemq/uri/JGroupsSchema.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/JGroupsSchema.java index b8f240b9c0..f1e3c90fa6 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/JGroupsSchema.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/JGroupsSchema.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; import java.io.NotSerializableException; import java.net.URI; import java.util.Map; -import org.apache.activemq.api.core.BroadcastEndpointFactory; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.JGroupsFileBroadcastEndpointFactory; -import org.apache.activemq.api.core.JGroupsPropertiesBroadcastEndpointFactory; -import org.apache.activemq.api.jms.ActiveMQJMSClient; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.utils.uri.SchemaConstants; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.JGroupsFileBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.JGroupsPropertiesBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.utils.uri.SchemaConstants; +import org.apache.activemq.artemis.utils.uri.URISchema; public class JGroupsSchema extends AbstractCFSchema { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/JMSConnectionOptions.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/JMSConnectionOptions.java similarity index 95% rename from activemq-jms-client/src/main/java/org/apache/activemq/uri/JMSConnectionOptions.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/JMSConnectionOptions.java index 75d221098b..3690e13b50 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/JMSConnectionOptions.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/JMSConnectionOptions.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; /** * This will represent all the possible options you could setup on URLs diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/TCPSchema.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/TCPSchema.java similarity index 81% rename from activemq-jms-client/src/main/java/org/apache/activemq/uri/TCPSchema.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/TCPSchema.java index 2b25454731..5ca8518dee 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/TCPSchema.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/TCPSchema.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.jms.ActiveMQJMSClient; -import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.utils.uri.SchemaConstants; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.utils.uri.SchemaConstants; +import org.apache.activemq.artemis.utils.uri.URISchema; import java.net.URI; import java.util.List; diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/UDPSchema.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/UDPSchema.java similarity index 83% rename from activemq-jms-client/src/main/java/org/apache/activemq/uri/UDPSchema.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/UDPSchema.java index 55a3bc8d8d..27405614ce 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/UDPSchema.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/uri/UDPSchema.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; import java.net.URI; import java.util.Map; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.UDPBroadcastEndpointFactory; -import org.apache.activemq.api.jms.ActiveMQJMSClient; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.utils.uri.SchemaConstants; -import org.apache.activemq.utils.uri.URISchema; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.utils.uri.SchemaConstants; +import org.apache.activemq.artemis.utils.uri.URISchema; public class UDPSchema extends AbstractCFSchema { diff --git a/activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java b/artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java similarity index 93% rename from activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java rename to artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java index f9522f1d0e..5406215527 100644 --- a/activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java +++ b/artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; @@ -24,23 +24,23 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.apache.activemq.api.core.BroadcastEndpointFactory; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.JGroupsFileBroadcastEndpointFactory; -import org.apache.activemq.api.core.JGroupsPropertiesBroadcastEndpointFactory; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.UDPBroadcastEndpointFactory; -import org.apache.activemq.api.jms.ActiveMQJMSClient; -import org.apache.activemq.api.jms.JMSFactoryType; -import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQQueueConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQTopicConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQXAQueueConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQXATopicConnectionFactory; -import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.JGroupsFileBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.JGroupsPropertiesBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQQueueConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQTopicConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQXAQueueConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQXATopicConnectionFactory; +import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.commons.beanutils.BeanUtilsBean; import org.junit.Assert; import org.junit.Test; diff --git a/activemq-jms-server/pom.xml b/artemis-jms-server/pom.xml similarity index 88% rename from activemq-jms-server/pom.xml rename to artemis-jms-server/pom.xml index 3a49049e59..0fa7da3aa3 100644 --- a/activemq-jms-server/pom.xml +++ b/artemis-jms-server/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-jms-server + artemis-jms-server jar ActiveMQ Artemis JMS Server @@ -40,22 +40,22 @@ org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-service-extensions + artemis-service-extensions ${project.version} @@ -88,7 +88,7 @@ 512m false true - org.apache.activemq.core:org.apache.activemq.utils + org.apache.activemq.artemis.core:org.apache.activemq.artemis.utils diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ActiveMQJMSBridgeLogger.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java similarity index 98% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ActiveMQJMSBridgeLogger.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java index 1df8f9cc6a..ae904f3c56 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ActiveMQJMSBridgeLogger.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ActiveMQJMSBridgeLogger.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.bridge; +package org.apache.activemq.artemis.jms.bridge; import javax.management.ObjectName; diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ConnectionFactoryFactory.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ConnectionFactoryFactory.java similarity index 94% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ConnectionFactoryFactory.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ConnectionFactoryFactory.java index 43a5695348..378ed915b3 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/ConnectionFactoryFactory.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/ConnectionFactoryFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.bridge; +package org.apache.activemq.artemis.jms.bridge; public interface ConnectionFactoryFactory { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/DestinationFactory.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/DestinationFactory.java similarity index 95% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/DestinationFactory.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/DestinationFactory.java index b1b27118dd..71e548d145 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/DestinationFactory.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/DestinationFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.bridge; +package org.apache.activemq.artemis.jms.bridge; import javax.jms.Destination; diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java similarity index 95% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java index ddf18cdbe2..9156c4c6c8 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridge.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridge.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.bridge; +package org.apache.activemq.artemis.jms.bridge; import javax.transaction.TransactionManager; -import org.apache.activemq.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; public interface JMSBridge extends ActiveMQComponent { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridgeControl.java similarity index 93% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridgeControl.java index 92257d72c0..8a44969ff4 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/JMSBridgeControl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/JMSBridgeControl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.bridge; +package org.apache.activemq.artemis.jms.bridge; -import org.apache.activemq.api.core.management.ActiveMQComponentControl; +import org.apache.activemq.artemis.api.core.management.ActiveMQComponentControl; public interface JMSBridgeControl extends ActiveMQComponentControl { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java similarity index 98% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java index 1126cc6db9..0da768d0d9 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/QualityOfServiceMode.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.bridge; +package org.apache.activemq.artemis.jms.bridge; /** *

Quality of server (QoS) levels

diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java similarity index 95% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeControlImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java index 185f00ecbd..b300a7b81b 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeControlImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.bridge.impl; +package org.apache.activemq.artemis.jms.bridge.impl; + +import org.apache.activemq.artemis.jms.bridge.JMSBridge; +import org.apache.activemq.artemis.jms.bridge.JMSBridgeControl; +import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode; import javax.management.StandardMBean; -import org.apache.activemq.jms.bridge.JMSBridge; -import org.apache.activemq.jms.bridge.JMSBridgeControl; -import org.apache.activemq.jms.bridge.QualityOfServiceMode; - public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeControl { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java similarity index 97% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java index 9feb5287f0..2650a9bfb7 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.bridge.impl; +package org.apache.activemq.artemis.jms.bridge.impl; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -49,28 +49,28 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.client.FailoverEventListener; -import org.apache.activemq.api.core.client.FailoverEventType; -import org.apache.activemq.api.jms.ActiveMQJMSConstants; -import org.apache.activemq.jms.bridge.ConnectionFactoryFactory; -import org.apache.activemq.jms.bridge.DestinationFactory; -import org.apache.activemq.jms.bridge.ActiveMQJMSBridgeLogger; -import org.apache.activemq.jms.bridge.JMSBridge; -import org.apache.activemq.jms.bridge.JMSBridgeControl; -import org.apache.activemq.jms.bridge.QualityOfServiceMode; -import org.apache.activemq.jms.client.ActiveMQConnection; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQMessage; -import org.apache.activemq.jms.server.ActiveMQJMSServerBundle; -import org.apache.activemq.service.extensions.ServiceUtils; -import org.apache.activemq.service.extensions.xa.recovery.ActiveMQRegistry; -import org.apache.activemq.service.extensions.xa.recovery.XARecoveryConfig; -import org.apache.activemq.utils.ClassloadingUtil; -import org.apache.activemq.utils.DefaultSensitiveStringCodec; -import org.apache.activemq.utils.PasswordMaskingUtil; -import org.apache.activemq.utils.SensitiveDataCodec; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.client.FailoverEventListener; +import org.apache.activemq.artemis.api.core.client.FailoverEventType; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants; +import org.apache.activemq.artemis.jms.bridge.ActiveMQJMSBridgeLogger; +import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq.artemis.jms.bridge.DestinationFactory; +import org.apache.activemq.artemis.jms.bridge.JMSBridge; +import org.apache.activemq.artemis.jms.bridge.JMSBridgeControl; +import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode; +import org.apache.activemq.artemis.jms.client.ActiveMQConnection; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQMessage; +import org.apache.activemq.artemis.jms.server.ActiveMQJMSServerBundle; +import org.apache.activemq.artemis.service.extensions.ServiceUtils; +import org.apache.activemq.artemis.service.extensions.xa.recovery.ActiveMQRegistry; +import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConfig; +import org.apache.activemq.artemis.utils.ClassloadingUtil; +import org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec; +import org.apache.activemq.artemis.utils.PasswordMaskingUtil; +import org.apache.activemq.artemis.utils.SensitiveDataCodec; public final class JMSBridgeImpl implements JMSBridge { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIConnectionFactoryFactory.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java similarity index 90% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIConnectionFactoryFactory.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java index 655fcd238f..fc67a97970 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIConnectionFactoryFactory.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.bridge.impl; +package org.apache.activemq.artemis.jms.bridge.impl; + +import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory; import java.util.Hashtable; -import org.apache.activemq.jms.bridge.ConnectionFactoryFactory; - public class JNDIConnectionFactoryFactory extends JNDIFactorySupport implements ConnectionFactoryFactory { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIDestinationFactory.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java similarity index 91% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIDestinationFactory.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java index c98bb6b902..cf243f329c 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIDestinationFactory.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.bridge.impl; +package org.apache.activemq.artemis.jms.bridge.impl; + +import org.apache.activemq.artemis.jms.bridge.DestinationFactory; import java.util.Hashtable; import javax.jms.Destination; -import org.apache.activemq.jms.bridge.DestinationFactory; - public class JNDIDestinationFactory extends JNDIFactorySupport implements DestinationFactory { public JNDIDestinationFactory(final Hashtable jndiProperties, final String lookup) diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIFactorySupport.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIFactorySupport.java similarity index 96% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIFactorySupport.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIFactorySupport.java index 8fb259d63f..37696def51 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JNDIFactorySupport.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIFactorySupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.bridge.impl; +package org.apache.activemq.artemis.jms.bridge.impl; import java.util.Hashtable; diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java similarity index 94% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java index ee8e3324fa..cff365e0f0 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.management.impl; +package org.apache.activemq.artemis.jms.management.impl; import javax.management.MBeanInfo; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.management.Parameter; -import org.apache.activemq.api.jms.management.ConnectionFactoryControl; -import org.apache.activemq.core.management.impl.MBeanInfoHelper; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.management.Parameter; +import org.apache.activemq.artemis.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq.artemis.core.management.impl.MBeanInfoHelper; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.server.JMSServerManager; +import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration; public class JMSConnectionFactoryControlImpl extends StandardMBean implements ConnectionFactoryControl { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java similarity index 92% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java index 8d8ef660a5..df7d716a54 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.management.impl; +package org.apache.activemq.artemis.jms.management.impl; import javax.management.MBeanInfo; import javax.management.StandardMBean; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.FilterConstants; -import org.apache.activemq.api.core.management.MessageCounterInfo; -import org.apache.activemq.api.core.management.Operation; -import org.apache.activemq.api.core.management.QueueControl; -import org.apache.activemq.api.jms.management.JMSQueueControl; -import org.apache.activemq.core.management.impl.MBeanInfoHelper; -import org.apache.activemq.core.messagecounter.MessageCounter; -import org.apache.activemq.core.messagecounter.impl.MessageCounterHelper; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.jms.client.ActiveMQMessage; -import org.apache.activemq.jms.client.SelectorTranslator; -import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.FilterConstants; +import org.apache.activemq.artemis.api.core.management.MessageCounterInfo; +import org.apache.activemq.artemis.api.core.management.Operation; +import org.apache.activemq.artemis.api.core.management.QueueControl; +import org.apache.activemq.artemis.api.jms.management.JMSQueueControl; +import org.apache.activemq.artemis.core.management.impl.MBeanInfoHelper; +import org.apache.activemq.artemis.core.messagecounter.MessageCounter; +import org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterHelper; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.jms.client.ActiveMQMessage; +import org.apache.activemq.artemis.jms.client.SelectorTranslator; +import org.apache.activemq.artemis.jms.server.JMSServerManager; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; public class JMSQueueControlImpl extends StandardMBean implements JMSQueueControl { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java similarity index 94% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java index 8f16d76e31..2e8b541c37 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.management.impl; +package org.apache.activemq.artemis.jms.management.impl; import javax.jms.JMSRuntimeException; import javax.management.ListenerNotFoundException; @@ -33,32 +33,32 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.management.Parameter; -import org.apache.activemq.api.jms.JMSFactoryType; -import org.apache.activemq.api.jms.management.ConnectionFactoryControl; -import org.apache.activemq.api.jms.management.DestinationControl; -import org.apache.activemq.api.jms.management.JMSQueueControl; -import org.apache.activemq.api.jms.management.JMSServerControl; -import org.apache.activemq.api.jms.management.TopicControl; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.management.impl.AbstractControl; -import org.apache.activemq.core.management.impl.MBeanInfoHelper; -import org.apache.activemq.core.server.ServerConsumer; -import org.apache.activemq.core.server.ServerSession; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.jms.server.ActiveMQJMSServerLogger; -import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.apache.activemq.jms.server.management.JMSNotificationType; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.management.Parameter; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq.artemis.api.jms.management.DestinationControl; +import org.apache.activemq.artemis.api.jms.management.JMSQueueControl; +import org.apache.activemq.artemis.api.jms.management.JMSServerControl; +import org.apache.activemq.artemis.api.jms.management.TopicControl; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.management.impl.AbstractControl; +import org.apache.activemq.artemis.core.management.impl.MBeanInfoHelper; +import org.apache.activemq.artemis.core.server.ServerConsumer; +import org.apache.activemq.artemis.core.server.ServerSession; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.jms.server.ActiveMQJMSServerLogger; +import org.apache.activemq.artemis.jms.server.JMSServerManager; +import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq.artemis.jms.server.management.JMSNotificationType; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; public class JMSServerControlImpl extends AbstractControl implements JMSServerControl, NotificationEmitter, - org.apache.activemq.core.server.management.NotificationListener + org.apache.activemq.artemis.core.server.management.NotificationListener { // Constants ----------------------------------------------------- @@ -891,7 +891,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo // Protected ----------------------------------------------------- /* (non-Javadoc) - * @see org.apache.activemq.core.management.impl.AbstractControl#fillMBeanOperationInfo() + * @see org.apache.activemq.artemis.core.management.impl.AbstractControl#fillMBeanOperationInfo() */ @Override protected MBeanOperationInfo[] fillMBeanOperationInfo() @@ -1041,7 +1041,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo } @Override - public void onNotification(org.apache.activemq.core.server.management.Notification notification) + public void onNotification(org.apache.activemq.artemis.core.server.management.Notification notification) { if (!(notification.getType() instanceof JMSNotificationType)) return; JMSNotificationType type = (JMSNotificationType) notification.getType(); diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java similarity index 92% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java index 3fca74e3a4..5abdba1b64 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.management.impl; +package org.apache.activemq.artemis.jms.management.impl; import java.util.ArrayList; import java.util.Collections; @@ -24,21 +24,21 @@ import java.util.Map; import javax.management.MBeanInfo; import javax.management.StandardMBean; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.management.AddressControl; -import org.apache.activemq.api.core.management.ActiveMQServerControl; -import org.apache.activemq.api.core.management.QueueControl; -import org.apache.activemq.api.core.management.ResourceNames; -import org.apache.activemq.api.jms.management.TopicControl; -import org.apache.activemq.core.management.impl.MBeanInfoHelper; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.jms.client.ActiveMQMessage; -import org.apache.activemq.jms.client.SelectorTranslator; -import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.management.AddressControl; +import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl; +import org.apache.activemq.artemis.api.core.management.QueueControl; +import org.apache.activemq.artemis.api.core.management.ResourceNames; +import org.apache.activemq.artemis.api.jms.management.TopicControl; +import org.apache.activemq.artemis.core.management.impl.MBeanInfoHelper; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.jms.client.ActiveMQMessage; +import org.apache.activemq.artemis.jms.client.SelectorTranslator; +import org.apache.activemq.artemis.jms.server.JMSServerManager; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; public class JMSTopicControlImpl extends StandardMBean implements TopicControl { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/JMSStorageManager.java similarity index 79% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/JMSStorageManager.java index 5546971bde..46cef99cf8 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/JMSStorageManager.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.persistence; +package org.apache.activemq.artemis.jms.persistence; import java.util.List; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory; -import org.apache.activemq.jms.persistence.config.PersistedDestination; -import org.apache.activemq.jms.persistence.config.PersistedBindings; -import org.apache.activemq.jms.persistence.config.PersistedType; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination; +import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings; +import org.apache.activemq.artemis.jms.persistence.config.PersistedType; public interface JMSStorageManager extends ActiveMQComponent { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedBindings.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedBindings.java similarity index 92% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedBindings.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedBindings.java index e8f65c7559..da4bf32d07 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedBindings.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedBindings.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.persistence.config; +package org.apache.activemq.artemis.jms.persistence.config; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.utils.BufferHelper; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.utils.BufferHelper; +import org.apache.activemq.artemis.utils.DataConstants; public class PersistedBindings implements EncodingSupport { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedConnectionFactory.java similarity index 87% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedConnectionFactory.java index 9c7e75b4ca..f27a6f6f25 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedConnectionFactory.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedConnectionFactory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.persistence.config; +package org.apache.activemq.artemis.jms.persistence.config; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl; public class PersistedConnectionFactory implements EncodingSupport { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java similarity index 90% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java index d40181bf7b..d030feefd8 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedDestination.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.persistence.config; +package org.apache.activemq.artemis.jms.persistence.config; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.utils.BufferHelper; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.utils.BufferHelper; +import org.apache.activemq.artemis.utils.DataConstants; public class PersistedDestination implements EncodingSupport { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedType.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedType.java similarity index 95% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedType.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedType.java index 7f0a968753..c211f43092 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedType.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.persistence.config; +package org.apache.activemq.artemis.jms.persistence.config; public enum PersistedType { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java similarity index 88% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java index 81fad6d537..e2a30e1441 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.persistence.impl.journal; +package org.apache.activemq.artemis.jms.persistence.impl.journal; import java.io.File; import java.util.ArrayList; @@ -22,25 +22,25 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.journal.PreparedTransactionInfo; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.impl.JournalImpl; -import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq.core.replication.ReplicatedJournal; -import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.jms.persistence.JMSStorageManager; -import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory; -import org.apache.activemq.jms.persistence.config.PersistedDestination; -import org.apache.activemq.jms.persistence.config.PersistedBindings; -import org.apache.activemq.jms.persistence.config.PersistedType; -import org.apache.activemq.utils.IDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.artemis.core.replication.ReplicatedJournal; +import org.apache.activemq.artemis.core.replication.ReplicationManager; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.jms.persistence.JMSStorageManager; +import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination; +import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings; +import org.apache.activemq.artemis.jms.persistence.config.PersistedType; +import org.apache.activemq.artemis.utils.IDGenerator; public final class JMSJournalStorageManagerImpl implements JMSStorageManager { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java similarity index 83% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java index b697329e42..9652964b41 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.persistence.impl.nullpm; +package org.apache.activemq.artemis.jms.persistence.impl.nullpm; import java.util.Collections; import java.util.List; -import org.apache.activemq.jms.persistence.JMSStorageManager; -import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory; -import org.apache.activemq.jms.persistence.config.PersistedDestination; -import org.apache.activemq.jms.persistence.config.PersistedBindings; -import org.apache.activemq.jms.persistence.config.PersistedType; +import org.apache.activemq.artemis.jms.persistence.JMSStorageManager; +import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination; +import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings; +import org.apache.activemq.artemis.jms.persistence.config.PersistedType; public class NullJMSStorageManagerImpl implements JMSStorageManager { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java similarity index 89% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java index 535534b96b..bbd0789e66 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server; +package org.apache.activemq.artemis.jms.server; -import org.apache.activemq.api.core.ActiveMQAddressExistsException; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.artemis.api.core.ActiveMQAddressExistsException; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java similarity index 97% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java index 7162a1491c..a9930b3f74 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server; +package org.apache.activemq.artemis.jms.server; -import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerConfigParser.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerConfigParser.java similarity index 86% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerConfigParser.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerConfigParser.java index c18f1c7177..692b84b566 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerConfigParser.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerConfigParser.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server; +package org.apache.activemq.artemis.jms.server; import java.io.InputStream; -import org.apache.activemq.jms.server.config.JMSConfiguration; -import org.apache.activemq.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq.jms.server.config.TopicConfiguration; +import org.apache.activemq.artemis.jms.server.config.JMSConfiguration; +import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.artemis.jms.server.config.TopicConfiguration; import org.w3c.dom.Node; public interface JMSServerConfigParser diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java similarity index 95% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java index eabf6d4810..e1afbf81a2 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server; +package org.apache.activemq.artemis.jms.server; import java.util.List; import java.util.Set; -import org.apache.activemq.api.jms.JMSFactoryType; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; /** * The JMS Management interface. diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/ConnectionFactoryConfiguration.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/ConnectionFactoryConfiguration.java similarity index 96% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/ConnectionFactoryConfiguration.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/ConnectionFactoryConfiguration.java index 1df474fad9..448c24b733 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/ConnectionFactoryConfiguration.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/ConnectionFactoryConfiguration.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.config; +package org.apache.activemq.artemis.jms.server.config; import java.util.List; -import org.apache.activemq.api.jms.JMSFactoryType; -import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.core.journal.EncodingSupport; /** * A ConnectionFactoryConfiguration for {@link javax.jms.ConnectionFactory} objects. diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/JMSConfiguration.java similarity index 96% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/JMSConfiguration.java index 335508c606..112bfbf878 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/JMSConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.config; +package org.apache.activemq.artemis.jms.server.config; import java.util.List; diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSQueueConfiguration.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/JMSQueueConfiguration.java similarity index 95% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSQueueConfiguration.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/JMSQueueConfiguration.java index b6092dd6e7..f84b8d3a44 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSQueueConfiguration.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/JMSQueueConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.config; +package org.apache.activemq.artemis.jms.server.config; public interface JMSQueueConfiguration { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/TopicConfiguration.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/TopicConfiguration.java similarity index 94% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/TopicConfiguration.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/TopicConfiguration.java index bb272fe8bd..591bc734a7 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/TopicConfiguration.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/TopicConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.config; +package org.apache.activemq.artemis.jms.server.config; public interface TopicConfiguration { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java similarity index 97% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java index b9bdfabd71..6f3a78f338 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.config.impl; +package org.apache.activemq.artemis.jms.server.config.impl; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.jms.JMSFactoryType; -import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq.utils.BufferHelper; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.artemis.utils.BufferHelper; +import org.apache.activemq.artemis.utils.DataConstants; /** * This class contains the configuration properties of a connection factory. diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/FileJMSConfiguration.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java similarity index 88% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/FileJMSConfiguration.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java index d023cf1af0..c3610cd9ce 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/FileJMSConfiguration.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.config.impl; +package org.apache.activemq.artemis.jms.server.config.impl; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.config.impl.Validators; -import org.apache.activemq.core.deployers.Deployable; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.jms.server.ActiveMQJMSServerLogger; -import org.apache.activemq.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq.jms.server.config.TopicConfiguration; -import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.utils.XMLConfigurationUtil; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.config.impl.Validators; +import org.apache.activemq.artemis.core.deployers.Deployable; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.jms.server.ActiveMQJMSServerLogger; +import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.artemis.jms.server.config.TopicConfiguration; +import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.utils.XMLConfigurationUtil; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSConfigurationImpl.java similarity index 85% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSConfigurationImpl.java index 6393305bf0..63f7604811 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSConfigurationImpl.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.config.impl; +package org.apache.activemq.artemis.jms.server.config.impl; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq.jms.server.config.JMSConfiguration; -import org.apache.activemq.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq.jms.server.config.TopicConfiguration; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.artemis.jms.server.config.JMSConfiguration; +import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.artemis.jms.server.config.TopicConfiguration; public class JMSConfigurationImpl implements JMSConfiguration diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSQueueConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSQueueConfigurationImpl.java similarity index 94% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSQueueConfigurationImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSQueueConfigurationImpl.java index bb7b00fd7b..0978cb25a3 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSQueueConfigurationImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSQueueConfigurationImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.config.impl; +package org.apache.activemq.artemis.jms.server.config.impl; -import org.apache.activemq.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration; public class JMSQueueConfigurationImpl implements JMSQueueConfiguration diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TopicConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TopicConfigurationImpl.java similarity index 93% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TopicConfigurationImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TopicConfigurationImpl.java index 58e8a69650..620ec5c73c 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TopicConfigurationImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TopicConfigurationImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.config.impl; +package org.apache.activemq.artemis.jms.server.config.impl; -import org.apache.activemq.jms.server.config.TopicConfiguration; +import org.apache.activemq.artemis.jms.server.config.TopicConfiguration; public class TopicConfigurationImpl implements TopicConfiguration diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TransportConfigurationEncodingSupport.java similarity index 93% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TransportConfigurationEncodingSupport.java index 8842412130..6f774abcb8 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/TransportConfigurationEncodingSupport.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TransportConfigurationEncodingSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.config.impl; +package org.apache.activemq.artemis.jms.server.config.impl; import java.util.ArrayList; import java.util.HashMap; @@ -22,11 +22,11 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.utils.BufferHelper; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.utils.BufferHelper; +import org.apache.activemq.artemis.utils.DataConstants; public class TransportConfigurationEncodingSupport { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java similarity index 84% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java index 8927658570..c698170625 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.embedded; +package org.apache.activemq.artemis.jms.server.embedded; import javax.naming.Context; -import org.apache.activemq.core.config.FileDeploymentManager; -import org.apache.activemq.core.registry.JndiBindingRegistry; -import org.apache.activemq.core.registry.MapBindingRegistry; -import org.apache.activemq.core.server.embedded.EmbeddedActiveMQ; -import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.jms.server.config.JMSConfiguration; -import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration; -import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.core.config.FileDeploymentManager; +import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; +import org.apache.activemq.artemis.core.registry.MapBindingRegistry; +import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; +import org.apache.activemq.artemis.jms.server.JMSServerManager; +import org.apache.activemq.artemis.jms.server.config.JMSConfiguration; +import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration; +import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; /** * Simple bootstrap class that parses activemq config files (server and jms and security) and starts diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java similarity index 94% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java index ad74b12e76..30a7e13fb7 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.impl; +package org.apache.activemq.artemis.jms.server.impl; import javax.naming.NamingException; import javax.transaction.xa.Xid; @@ -32,59 +32,59 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.management.AddressControl; -import org.apache.activemq.api.core.management.ResourceNames; -import org.apache.activemq.api.jms.ActiveMQJMSClient; -import org.apache.activemq.api.jms.JMSFactoryType; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.ActivateCallback; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.QueueCreator; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionDetail; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.jms.client.ActiveMQQueue; -import org.apache.activemq.jms.client.ActiveMQTopic; -import org.apache.activemq.jms.client.SelectorTranslator; -import org.apache.activemq.jms.persistence.JMSStorageManager; -import org.apache.activemq.jms.persistence.config.PersistedBindings; -import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory; -import org.apache.activemq.jms.persistence.config.PersistedDestination; -import org.apache.activemq.jms.persistence.config.PersistedType; -import org.apache.activemq.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; -import org.apache.activemq.jms.persistence.impl.nullpm.NullJMSStorageManagerImpl; -import org.apache.activemq.jms.server.ActiveMQJMSServerBundle; -import org.apache.activemq.jms.server.ActiveMQJMSServerLogger; -import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq.jms.server.config.JMSConfiguration; -import org.apache.activemq.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq.jms.server.config.TopicConfiguration; -import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.apache.activemq.jms.server.management.JMSManagementService; -import org.apache.activemq.jms.server.management.JMSNotificationType; -import org.apache.activemq.jms.server.management.impl.JMSManagementServiceImpl; -import org.apache.activemq.jms.transaction.JMSTransactionDetail; -import org.apache.activemq.spi.core.naming.BindingRegistry; -import org.apache.activemq.utils.TimeAndCounterIDGenerator; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.management.AddressControl; +import org.apache.activemq.artemis.api.core.management.ResourceNames; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.ActivateCallback; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.QueueCreator; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionDetail; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.jms.client.ActiveMQQueue; +import org.apache.activemq.artemis.jms.client.ActiveMQTopic; +import org.apache.activemq.artemis.jms.client.SelectorTranslator; +import org.apache.activemq.artemis.jms.persistence.JMSStorageManager; +import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings; +import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination; +import org.apache.activemq.artemis.jms.persistence.config.PersistedType; +import org.apache.activemq.artemis.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; +import org.apache.activemq.artemis.jms.persistence.impl.nullpm.NullJMSStorageManagerImpl; +import org.apache.activemq.artemis.jms.server.ActiveMQJMSServerBundle; +import org.apache.activemq.artemis.jms.server.ActiveMQJMSServerLogger; +import org.apache.activemq.artemis.jms.server.JMSServerManager; +import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.artemis.jms.server.config.JMSConfiguration; +import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.artemis.jms.server.config.TopicConfiguration; +import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq.artemis.jms.server.management.JMSManagementService; +import org.apache.activemq.artemis.jms.server.management.JMSNotificationType; +import org.apache.activemq.artemis.jms.server.management.impl.JMSManagementServiceImpl; +import org.apache.activemq.artemis.jms.transaction.JMSTransactionDetail; +import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.utils.TimeAndCounterIDGenerator; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; /** * A Deployer used to create and add to Bindings queues, topics and connection @@ -387,8 +387,8 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback * This method and {@code server.start()} are interdependent in the following way: *
    *
  1. {@link JMSServerManagerImpl#start()} is called, it sets {@code start_called=true}, and - * calls {@link org.apache.activemq.core.server.impl.ActiveMQServerImpl#start()} - *
  2. {@link org.apache.activemq.core.server.impl.ActiveMQServerImpl#start()} will call {@link JMSServerManagerImpl#activated()} + * calls {@link org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl#start()} + *
  3. {@link org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl#start()} will call {@link JMSServerManagerImpl#activated()} *
  4. {@link JMSServerManagerImpl#activated()} checks the value of {@link #startCalled}, which * must already be true. *
@@ -1328,7 +1328,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback /** * @param cfConfig * @return - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ protected ActiveMQConnectionFactory internalCreateCFPOJO(final ConnectionFactoryConfiguration cfConfig) throws ActiveMQException { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSManagementService.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/JMSManagementService.java similarity index 73% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSManagementService.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/JMSManagementService.java index 1c5f33f4ca..b3a08790ff 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSManagementService.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/JMSManagementService.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.management; +package org.apache.activemq.artemis.jms.server.management; -import org.apache.activemq.api.jms.management.JMSServerControl; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQQueue; -import org.apache.activemq.jms.client.ActiveMQTopic; -import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.artemis.api.jms.management.JMSServerControl; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQQueue; +import org.apache.activemq.artemis.jms.client.ActiveMQTopic; +import org.apache.activemq.artemis.jms.server.JMSServerManager; +import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration; public interface JMSManagementService { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSNotificationType.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/JMSNotificationType.java similarity index 86% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSNotificationType.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/JMSNotificationType.java index ce56a15b29..0ab78567ca 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSNotificationType.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/JMSNotificationType.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.management; +package org.apache.activemq.artemis.jms.server.management; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.management.NotificationType; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.NotificationType; public enum JMSNotificationType implements NotificationType { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/impl/JMSManagementServiceImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/impl/JMSManagementServiceImpl.java similarity index 80% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/impl/JMSManagementServiceImpl.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/impl/JMSManagementServiceImpl.java index e6b0545198..bc82ba71de 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/impl/JMSManagementServiceImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/impl/JMSManagementServiceImpl.java @@ -14,32 +14,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.server.management.impl; +package org.apache.activemq.artemis.jms.server.management.impl; import javax.management.ObjectName; -import org.apache.activemq.api.core.management.AddressControl; -import org.apache.activemq.api.core.management.QueueControl; -import org.apache.activemq.api.core.management.ResourceNames; -import org.apache.activemq.api.jms.management.ConnectionFactoryControl; -import org.apache.activemq.api.jms.management.JMSQueueControl; -import org.apache.activemq.api.jms.management.JMSServerControl; -import org.apache.activemq.api.jms.management.TopicControl; -import org.apache.activemq.core.messagecounter.MessageCounter; -import org.apache.activemq.core.messagecounter.MessageCounterManager; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQQueue; -import org.apache.activemq.jms.client.ActiveMQTopic; -import org.apache.activemq.jms.management.impl.JMSConnectionFactoryControlImpl; -import org.apache.activemq.jms.management.impl.JMSQueueControlImpl; -import org.apache.activemq.jms.management.impl.JMSServerControlImpl; -import org.apache.activemq.jms.management.impl.JMSTopicControlImpl; -import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq.jms.server.management.JMSManagementService; +import org.apache.activemq.artemis.api.core.management.AddressControl; +import org.apache.activemq.artemis.api.core.management.QueueControl; +import org.apache.activemq.artemis.api.core.management.ResourceNames; +import org.apache.activemq.artemis.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq.artemis.api.jms.management.JMSQueueControl; +import org.apache.activemq.artemis.api.jms.management.JMSServerControl; +import org.apache.activemq.artemis.api.jms.management.TopicControl; +import org.apache.activemq.artemis.core.messagecounter.MessageCounter; +import org.apache.activemq.artemis.core.messagecounter.MessageCounterManager; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQQueue; +import org.apache.activemq.artemis.jms.client.ActiveMQTopic; +import org.apache.activemq.artemis.jms.management.impl.JMSConnectionFactoryControlImpl; +import org.apache.activemq.artemis.jms.management.impl.JMSQueueControlImpl; +import org.apache.activemq.artemis.jms.management.impl.JMSServerControlImpl; +import org.apache.activemq.artemis.jms.management.impl.JMSTopicControlImpl; +import org.apache.activemq.artemis.jms.server.JMSServerManager; +import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.artemis.jms.server.management.JMSManagementService; public class JMSManagementServiceImpl implements JMSManagementService { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/transaction/JMSTransactionDetail.java similarity index 75% rename from activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java rename to artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/transaction/JMSTransactionDetail.java index fee74121f6..bf2d149c10 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/transaction/JMSTransactionDetail.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.transaction; +package org.apache.activemq.artemis.jms.transaction; import java.util.Map; import javax.transaction.xa.Xid; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionDetail; -import org.apache.activemq.jms.client.ActiveMQBytesMessage; -import org.apache.activemq.jms.client.ActiveMQMapMessage; -import org.apache.activemq.jms.client.ActiveMQMessage; -import org.apache.activemq.jms.client.ActiveMQObjectMessage; -import org.apache.activemq.jms.client.ActiveMQStreamMessage; -import org.apache.activemq.jms.client.ActiveMQTextMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionDetail; +import org.apache.activemq.artemis.jms.client.ActiveMQBytesMessage; +import org.apache.activemq.artemis.jms.client.ActiveMQMapMessage; +import org.apache.activemq.artemis.jms.client.ActiveMQMessage; +import org.apache.activemq.artemis.jms.client.ActiveMQObjectMessage; +import org.apache.activemq.artemis.jms.client.ActiveMQStreamMessage; +import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; public class JMSTransactionDetail extends TransactionDetail { diff --git a/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd b/artemis-jms-server/src/main/resources/schema/activemq-jms.xsd similarity index 100% rename from activemq-jms-server/src/main/resources/schema/activemq-jms.xsd rename to artemis-jms-server/src/main/resources/schema/activemq-jms.xsd diff --git a/activemq-journal/pom.xml b/artemis-journal/pom.xml similarity index 90% rename from activemq-journal/pom.xml rename to artemis-journal/pom.xml index ca80a79519..90ae4df6c4 100644 --- a/activemq-journal/pom.xml +++ b/artemis-journal/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-journal + artemis-journal jar ActiveMQ Artemis Journal @@ -53,12 +53,12 @@ org.apache.activemq - activemq-commons + artemis-commons ${project.version} org.apache.activemq - activemq-native + artemis-native ${project.version} diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AIOCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/AIOCallback.java similarity index 96% rename from activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AIOCallback.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/AIOCallback.java index f46328daa7..c7486e299a 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AIOCallback.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/AIOCallback.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.asyncio; +package org.apache.activemq.artemis.core.asyncio; /** * The interface used for AIO Callbacks. diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/AsynchronousFile.java similarity index 88% rename from activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/AsynchronousFile.java index a4578e4cd1..7783c1529a 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/AsynchronousFile.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.asyncio; +package org.apache.activemq.artemis.core.asyncio; import java.nio.ByteBuffer; -import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQException; public interface AsynchronousFile { @@ -29,13 +29,13 @@ public interface AsynchronousFile * Note: If you are using a native Linux implementation, maxIO can't be higher than what's defined on /proc/sys/fs/aio-max-nr, or you would get an error * @param fileName * @param maxIO The number of max concurrent asynchronous IO operations. It has to be balanced between the size of your writes and the capacity of your disk. - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ void open(String fileName, int maxIO) throws ActiveMQException; /** * Warning: This function will perform a synchronous IO, probably translating to a fstat call - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException * */ long size() throws ActiveMQException; @@ -44,7 +44,7 @@ public interface AsynchronousFile /** * Performs an internal direct write. - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ void writeInternal(long positionToWrite, long size, ByteBuffer bytes) throws ActiveMQException; diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/BufferCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/BufferCallback.java similarity index 95% rename from activemq-journal/src/main/java/org/apache/activemq/core/asyncio/BufferCallback.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/BufferCallback.java index bcf3627828..ad66643857 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/BufferCallback.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/BufferCallback.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.asyncio; +package org.apache.activemq.artemis.core.asyncio; import java.nio.ByteBuffer; diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/IOExceptionListener.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/IOExceptionListener.java similarity index 94% rename from activemq-journal/src/main/java/org/apache/activemq/core/asyncio/IOExceptionListener.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/IOExceptionListener.java index b105a21516..c00257017a 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/IOExceptionListener.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/IOExceptionListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.asyncio; +package org.apache.activemq.artemis.core.asyncio; public interface IOExceptionListener { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/ActiveMQFileLock.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/impl/ActiveMQFileLock.java similarity index 92% rename from activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/ActiveMQFileLock.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/impl/ActiveMQFileLock.java index e52a4f628f..cced4a9203 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/ActiveMQFileLock.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/impl/ActiveMQFileLock.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.asyncio.impl; +package org.apache.activemq.artemis.core.asyncio.impl; import java.io.IOException; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; -import org.apache.activemq.core.libaio.Native; +import org.apache.activemq.artemis.core.libaio.Native; public class ActiveMQFileLock extends FileLock { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/impl/AsynchronousFileImpl.java similarity index 96% rename from activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/impl/AsynchronousFileImpl.java index 7fa7115fb2..ff6d7931c1 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/impl/AsynchronousFileImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.asyncio.impl; +package org.apache.activemq.artemis.core.asyncio.impl; import java.nio.ByteBuffer; import java.nio.channels.FileLock; @@ -28,15 +28,15 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.core.asyncio.AIOCallback; -import org.apache.activemq.core.asyncio.AsynchronousFile; -import org.apache.activemq.core.asyncio.BufferCallback; -import org.apache.activemq.core.asyncio.IOExceptionListener; -import org.apache.activemq.core.libaio.Native; -import org.apache.activemq.journal.ActiveMQJournalLogger; -import org.apache.activemq.utils.ReusableLatch; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.core.asyncio.AIOCallback; +import org.apache.activemq.artemis.core.asyncio.AsynchronousFile; +import org.apache.activemq.artemis.core.asyncio.BufferCallback; +import org.apache.activemq.artemis.core.asyncio.IOExceptionListener; +import org.apache.activemq.artemis.core.libaio.Native; +import org.apache.activemq.artemis.journal.ActiveMQJournalLogger; +import org.apache.activemq.artemis.utils.ReusableLatch; /** * AsynchronousFile implementation @@ -136,7 +136,7 @@ public class AsynchronousFileImpl implements AsynchronousFile static { - String[] libraries = new String[]{"activemqAIO", "activemqAIO64", "activemqAIO32", "activemqAIO_ia64"}; + String[] libraries = new String[]{"artemis-native", "artemis-native-64", "artemis-native-32"}; for (String library : libraries) { @@ -671,7 +671,7 @@ public class AsynchronousFileImpl implements AsynchronousFile } /** - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException * @throws InterruptedException */ private void stopPoller() throws ActiveMQException, InterruptedException diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/EncodingSupport.java similarity index 90% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/EncodingSupport.java index 0e34ca2db8..c1da483578 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/EncodingSupport.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; -import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; /** * This interface provides encoding support for the Journal. diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOAsyncTask.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/IOAsyncTask.java similarity index 80% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/IOAsyncTask.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/IOAsyncTask.java index b63dc0c53b..dfbf2e84cb 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOAsyncTask.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/IOAsyncTask.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; -import org.apache.activemq.core.asyncio.AIOCallback; +import org.apache.activemq.artemis.core.asyncio.AIOCallback; /** * This class is just a direct extension of AIOCallback. - * Just to avoid the direct dependency of org.apache.activemq.core.asynciio.AIOCallback from the journal. + * Just to avoid the direct dependency of org.apache.activemq.artemis.core.asynciio.AIOCallback from the journal. */ public interface IOAsyncTask extends AIOCallback { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCompletion.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/IOCompletion.java similarity index 94% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCompletion.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/IOCompletion.java index a1028ecaee..27aa7305a6 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCompletion.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/IOCompletion.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; public interface IOCompletion extends IOAsyncTask { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCriticalErrorListener.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/IOCriticalErrorListener.java similarity index 94% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCriticalErrorListener.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/IOCriticalErrorListener.java index ab28fd3a25..d277ad0ea5 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCriticalErrorListener.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/IOCriticalErrorListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; public interface IOCriticalErrorListener { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java similarity index 97% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java index 9863e30185..036440d118 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; import java.util.List; import java.util.Map; -import org.apache.activemq.core.journal.impl.JournalFile; -import org.apache.activemq.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; /** * Most methods on the journal provide a blocking version where you select the sync mode and a non diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/JournalLoadInformation.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/JournalLoadInformation.java similarity index 98% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/JournalLoadInformation.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/JournalLoadInformation.java index 362dbe42d2..cd54f2c165 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/JournalLoadInformation.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/JournalLoadInformation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; /** * This is a POJO containing information about the journal during load time. diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/LoaderCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/LoaderCallback.java similarity index 95% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/LoaderCallback.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/LoaderCallback.java index 1fe4da2680..8c8170439e 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/LoaderCallback.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/LoaderCallback.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; public interface LoaderCallback extends TransactionFailureCallback { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/PreparedTransactionInfo.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/PreparedTransactionInfo.java similarity index 96% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/PreparedTransactionInfo.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/PreparedTransactionInfo.java index a4290bae45..0dd45f59bd 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/PreparedTransactionInfo.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/PreparedTransactionInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; import java.util.ArrayList; import java.util.List; diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/RecordInfo.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/RecordInfo.java similarity index 97% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/RecordInfo.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/RecordInfo.java index 70b6cbe6a5..9133d0901d 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/RecordInfo.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/RecordInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; public class RecordInfo { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/SequentialFile.java similarity index 94% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/SequentialFile.java index 6b1df7f199..11871e6289 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/SequentialFile.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.journal.impl.TimedBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.journal.impl.TimedBuffer; public interface SequentialFile { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFileFactory.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/SequentialFileFactory.java similarity index 98% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFileFactory.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/SequentialFileFactory.java index be2573a044..f04a2e96fb 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFileFactory.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/SequentialFileFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; import java.nio.ByteBuffer; import java.util.List; diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/TestableJournal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/TestableJournal.java similarity index 93% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/TestableJournal.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/TestableJournal.java index 22262f9914..d67aa6de73 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/TestableJournal.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/TestableJournal.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; -import org.apache.activemq.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; public interface TestableJournal extends Journal { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/TransactionFailureCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/TransactionFailureCallback.java similarity index 96% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/TransactionFailureCallback.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/TransactionFailureCallback.java index cd6be73594..9d4b790986 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/TransactionFailureCallback.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/TransactionFailureCallback.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal; +package org.apache.activemq.artemis.core.journal; import java.util.List; diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AIOSequentialFile.java similarity index 93% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AIOSequentialFile.java index 379960419f..ca89bbc79c 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AIOSequentialFile.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.asyncio.AsynchronousFile; -import org.apache.activemq.core.asyncio.BufferCallback; -import org.apache.activemq.core.asyncio.IOExceptionListener; -import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.asyncio.AsynchronousFile; +import org.apache.activemq.artemis.core.asyncio.BufferCallback; +import org.apache.activemq.artemis.core.asyncio.IOExceptionListener; +import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; public class AIOSequentialFile extends AbstractSequentialFile implements IOExceptionListener { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AIOSequentialFileFactory.java similarity index 92% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AIOSequentialFileFactory.java index 1b9a8e1547..948aab648d 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AIOSequentialFileFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; import java.nio.ByteBuffer; import java.security.AccessController; @@ -24,14 +24,14 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.core.asyncio.BufferCallback; -import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq.core.journal.IOCriticalErrorListener; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.libaio.Native; -import org.apache.activemq.journal.ActiveMQJournalLogger; -import org.apache.activemq.utils.ActiveMQThreadFactory; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.core.asyncio.BufferCallback; +import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.artemis.core.journal.IOCriticalErrorListener; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.libaio.Native; +import org.apache.activemq.artemis.journal.ActiveMQJournalLogger; +import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; public final class AIOSequentialFileFactory extends AbstractSequentialFileFactory { @@ -167,7 +167,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.SequentialFileFactory#releaseBuffer(java.nio.ByteBuffer) + * @see org.apache.activemq.artemis.core.journal.SequentialFileFactory#releaseBuffer(java.nio.ByteBuffer) */ @Override public synchronized void releaseBuffer(final ByteBuffer buffer) @@ -225,7 +225,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor private volatile long bufferReuseLastTime = System.currentTimeMillis(); /** - * This queue is fed by {@link org.apache.activemq.core.journal.impl.AIOSequentialFileFactory.ReuseBuffersController.LocalBufferCallback} + * This queue is fed by {@link org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory.ReuseBuffersController.LocalBufferCallback} * which is called directly by NIO or NIO. On the case of the AIO this is almost called by the native layer as * soon as the buffer is not being used any more and ready to be reused or GCed */ diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java similarity index 91% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java index 3dd1855c83..66989d3d75 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding; -import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecord; -import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord; -import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; /** * diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFile.java similarity index 93% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFile.java index fa52ce84ce..8c691e7bbe 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFile.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; import java.io.File; import java.io.IOException; @@ -25,16 +25,16 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQIOErrorException; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.journal.ActiveMQJournalBundle; -import org.apache.activemq.journal.ActiveMQJournalLogger; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQIOErrorException; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.journal.ActiveMQJournalBundle; +import org.apache.activemq.artemis.journal.ActiveMQJournalLogger; public abstract class AbstractSequentialFile implements SequentialFile { @@ -182,7 +182,7 @@ public abstract class AbstractSequentialFile implements SequentialFile /** * @throws IOException we declare throwing IOException because sub-classes need to do it - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ public synchronized void close() throws IOException, InterruptedException, ActiveMQException { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFileFactory.java similarity index 92% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFileFactory.java index b3acaecbe3..f9fc9f0515 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFileFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; import java.io.File; import java.io.FilenameFilter; @@ -28,12 +28,12 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.core.journal.IOCriticalErrorListener; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.journal.ActiveMQJournalLogger; -import org.apache.activemq.utils.ActiveMQThreadFactory; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.core.journal.IOCriticalErrorListener; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.journal.ActiveMQJournalLogger; +import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; /** * An abstract SequentialFileFactory containing basic functionality for both AIO and NIO SequentialFactories diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/CompactJournal.java similarity index 89% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/CompactJournal.java index 8f02297455..fb4aac567a 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/CompactJournal.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; -import org.apache.activemq.core.journal.IOCriticalErrorListener; +import org.apache.activemq.artemis.core.journal.IOCriticalErrorListener; /** * This is an undocumented class, that will open a journal and force compacting on it. @@ -32,7 +32,7 @@ public final class CompactJournal // NO_UCD { if (arg.length != 4) { - System.err.println("Use: java -cp activemq-core.jar org.apache.activemq.core.journal.impl.CompactJournal "); + System.err.println("Use: java -cp activemq-core.jar org.apache.activemq.artemis.core.journal.impl.CompactJournal "); return; } diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/DummyCallback.java similarity index 91% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/DummyCallback.java index 6c0cc43a8d..8b7f52834f 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/DummyCallback.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; -import org.apache.activemq.journal.ActiveMQJournalLogger; +import org.apache.activemq.artemis.journal.ActiveMQJournalLogger; class DummyCallback extends SyncIOCompletion { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java similarity index 86% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java index e69c9b3910..32cbb742d8 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; import java.util.List; import java.util.Map; @@ -23,24 +23,24 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQUnsupportedPacketException; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.journal.IOCompletion; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.journal.JournalLoadInformation; -import org.apache.activemq.core.journal.LoaderCallback; -import org.apache.activemq.core.journal.PreparedTransactionInfo; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.TransactionFailureCallback; -import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecord; -import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecordTX; -import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX; -import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; -import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecord; -import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecordTX; -import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQUnsupportedPacketException; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.journal.IOCompletion; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.journal.JournalLoadInformation; +import org.apache.activemq.artemis.core.journal.LoaderCallback; +import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.TransactionFailureCallback; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalAddRecordTX; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalCompleteRecordTX; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalDeleteRecord; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalDeleteRecordTX; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalInternalRecord; /** * Journal used at a replicating backup server during the synchronization of data with the 'live' diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalBase.java similarity index 95% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalBase.java index 2a9bbb4531..bd01e95ffd 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalBase.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.journal.IOCompletion; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.journal.IOCompletion; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.journal.impl.dataformat.ByteArrayEncoding; abstract class JournalBase implements Journal { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalCompactor.java similarity index 94% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalCompactor.java index f7a3baa617..efea9015d1 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalCompactor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; import java.util.ArrayList; import java.util.HashMap; @@ -24,21 +24,21 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding; -import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecord; -import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecordTX; -import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX; -import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; -import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecordTX; -import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord; -import org.apache.activemq.core.journal.impl.dataformat.JournalRollbackRecordTX; -import org.apache.activemq.journal.ActiveMQJournalLogger; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalAddRecordTX; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalCompleteRecordTX; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalDeleteRecordTX; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalRollbackRecordTX; +import org.apache.activemq.artemis.journal.ActiveMQJournalLogger; public class JournalCompactor extends AbstractJournalUpdateTask implements JournalRecordProvider { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalConstants.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalConstants.java similarity index 95% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalConstants.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalConstants.java index 3ac6cf5d20..dcf6852565 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalConstants.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalConstants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; public final class JournalConstants { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFile.java similarity index 93% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFile.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFile.java index d139a222dc..48b468afa7 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFile.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFile.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; -import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFile; public interface JournalFile { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFileImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFileImpl.java similarity index 97% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFileImpl.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFileImpl.java index 1f8f6d006c..daeb00ac5f 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFileImpl.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFileImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFile; public class JournalFileImpl implements JournalFile { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java similarity index 98% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java index baf3c92c9e..d8631394d6 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; import java.security.AccessController; import java.security.PrivilegedActionException; @@ -31,9 +31,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.journal.ActiveMQJournalLogger; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.journal.ActiveMQJournalLogger; /** * This is a helper class for the Journal, which will control access to dataFiles, openedFiles and freeFiles diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java similarity index 97% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java index 6f7af476f7..66a38cd393 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl; +package org.apache.activemq.artemis.core.journal.impl; import java.io.Serializable; import java.nio.ByteBuffer; @@ -43,33 +43,33 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.journal.IOCompletion; -import org.apache.activemq.core.journal.JournalLoadInformation; -import org.apache.activemq.core.journal.LoaderCallback; -import org.apache.activemq.core.journal.PreparedTransactionInfo; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.TestableJournal; -import org.apache.activemq.core.journal.TransactionFailureCallback; -import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding; -import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecord; -import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecordTX; -import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX; -import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; -import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecord; -import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecordTX; -import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord; -import org.apache.activemq.core.journal.impl.dataformat.JournalRollbackRecordTX; -import org.apache.activemq.journal.ActiveMQJournalBundle; -import org.apache.activemq.journal.ActiveMQJournalLogger; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.journal.IOCompletion; +import org.apache.activemq.artemis.core.journal.JournalLoadInformation; +import org.apache.activemq.artemis.core.journal.LoaderCallback; +import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.TestableJournal; +import org.apache.activemq.artemis.core.journal.TransactionFailureCallback; +import org.apache.activemq.artemis.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalAddRecordTX; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalCompleteRecordTX; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalDeleteRecord; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalDeleteRecordTX; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalRollbackRecordTX; +import org.apache.activemq.artemis.journal.ActiveMQJournalBundle; +import org.apache.activemq.artemis.journal.ActiveMQJournalLogger; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.DataConstants; /** *

A circular log implementation.

* A transaction record (Commit or Prepare), will hold the number of elements the transaction has in * the current file. *

- * While loading the {@link org.apache.activemq.core.journal.impl.JournalFile}, the number of operations found is matched against this + * While loading the {@link org.apache.activemq.artemis.core.journal.impl.JournalFile}, the number of operations found is matched against this * number. If for any reason there are missing operations, the transaction will be ignored. *

* We can't just use a global counter as reclaiming could delete files after the transaction was diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecord.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalDeleteRecord.java similarity index 87% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecord.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalDeleteRecord.java index 1f835247b4..53d34c1043 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecord.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalDeleteRecord.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl.dataformat; +package org.apache.activemq.artemis.core.journal.impl.dataformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; public class JournalDeleteRecord extends JournalInternalRecord { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecordTX.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalDeleteRecordTX.java similarity index 87% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecordTX.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalDeleteRecordTX.java index 39560ed524..b338567d6b 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecordTX.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalDeleteRecordTX.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl.dataformat; +package org.apache.activemq.artemis.core.journal.impl.dataformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; public class JournalDeleteRecordTX extends JournalInternalRecord { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalInternalRecord.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalInternalRecord.java similarity index 89% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalInternalRecord.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalInternalRecord.java index d65f7ee167..e98cd95fe6 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalInternalRecord.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalInternalRecord.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl.dataformat; +package org.apache.activemq.artemis.core.journal.impl.dataformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.EncodingSupport; public abstract class JournalInternalRecord implements EncodingSupport { diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalRollbackRecordTX.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalRollbackRecordTX.java similarity index 87% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalRollbackRecordTX.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalRollbackRecordTX.java index 09b892d668..7c2f7a3d83 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalRollbackRecordTX.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalRollbackRecordTX.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.journal.impl.dataformat; +package org.apache.activemq.artemis.core.journal.impl.dataformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; public class JournalRollbackRecordTX extends JournalInternalRecord { diff --git a/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java similarity index 94% rename from activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java index 053f440ef9..5598761e15 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalBundle.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.journal; +package org.apache.activemq.artemis.journal; -import org.apache.activemq.api.core.ActiveMQIOErrorException; +import org.apache.activemq.artemis.api.core.ActiveMQIOErrorException; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; import org.jboss.logging.Messages; diff --git a/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalLogger.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java similarity index 99% rename from activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalLogger.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java index 882b425d35..ccec555ac7 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalLogger.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.journal; +package org.apache.activemq.artemis.journal; -import org.apache.activemq.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; diff --git a/activemq-maven-plugin/pom.xml b/artemis-maven-plugin/pom.xml similarity index 91% rename from activemq-maven-plugin/pom.xml rename to artemis-maven-plugin/pom.xml index f50de06e34..f97a4b9e87 100644 --- a/activemq-maven-plugin/pom.xml +++ b/artemis-maven-plugin/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-maven-plugin + artemis-maven-plugin maven-plugin ActiveMQ Artemis Maven Plugin @@ -44,12 +44,12 @@ org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClient.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQClient.java similarity index 95% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClient.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQClient.java index 120bf21b85..a59546bda5 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClient.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQClient.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.maven; +package org.apache.activemq.artemis.maven; public interface ActiveMQClient { diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClientPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQClientPlugin.java similarity index 97% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClientPlugin.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQClientPlugin.java index 6dfd9f0ca5..d9b7787ca7 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClientPlugin.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQClientPlugin.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.maven; +package org.apache.activemq.artemis.maven; import java.lang.reflect.Method; import java.util.Properties; diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQStartPlugin.java similarity index 95% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQStartPlugin.java index 2d111d3df1..f5b4aa2da3 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQStartPlugin.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.maven; +package org.apache.activemq.artemis.maven; import javax.management.MBeanServer; import javax.management.ObjectName; @@ -23,10 +23,10 @@ import java.lang.management.ManagementFactory; import java.util.Arrays; import java.util.Properties; -import org.apache.activemq.server.ActiveMQBootstrap; -import org.apache.activemq.server.SpawnedActiveMQBootstrap; -import org.apache.activemq.server.SpawnedVMSupport; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.server.ActiveMQBootstrap; +import org.apache.activemq.artemis.server.SpawnedActiveMQBootstrap; +import org.apache.activemq.artemis.server.SpawnedVMSupport; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQStopPlugin.java similarity index 98% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQStopPlugin.java index 99d17086d8..51a74a7069 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ActiveMQStopPlugin.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.maven; +package org.apache.activemq.artemis.maven; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/InVMNodeManagerServer.java similarity index 88% rename from activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/InVMNodeManagerServer.java index b46fc48487..20c4d81236 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/InVMNodeManagerServer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests.util; +package org.apache.activemq.artemis.maven; import javax.management.MBeanServer; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; public final class InVMNodeManagerServer extends ActiveMQServerImpl { diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/PluginUtil.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/PluginUtil.java similarity index 98% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/maven/PluginUtil.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/PluginUtil.java index a066f4f98b..100423fd7d 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/PluginUtil.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/PluginUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.maven; +package org.apache.activemq.artemis.maven; import javax.management.MBeanServerConnection; import javax.management.MBeanServerInvocationHandler; diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManager.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/TestClusterManager.java similarity index 97% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManager.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/TestClusterManager.java index b03fa589af..c86f1c056b 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManager.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/TestClusterManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.maven; +package org.apache.activemq.artemis.maven; import java.io.IOException; import java.util.ArrayList; diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManagerMBean.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/TestClusterManagerMBean.java similarity index 96% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManagerMBean.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/TestClusterManagerMBean.java index 001e7a8942..d38163ca1d 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManagerMBean.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/TestClusterManagerMBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.maven; +package org.apache.activemq.artemis.maven; import java.io.IOException; diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestNode.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/TestNode.java similarity index 96% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestNode.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/TestNode.java index ba31c50463..73c1950b53 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestNode.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/TestNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.maven; +package org.apache.activemq.artemis.maven; import java.io.File; import java.io.IOException; diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java similarity index 85% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java index 2875afe4c4..c872f51df1 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.server; +package org.apache.activemq.artemis.server; import java.io.File; import java.lang.management.ManagementFactory; @@ -23,26 +23,26 @@ import java.util.Map; import java.util.Timer; import java.util.TimerTask; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.FileDeploymentManager; -import org.apache.activemq.core.config.HAPolicyConfiguration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.config.impl.FileConfiguration; -import org.apache.activemq.core.config.impl.FileSecurityConfiguration; -import org.apache.activemq.core.config.impl.SecurityConfiguration; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.InVMNodeManager; -import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.jms.server.config.JMSConfiguration; -import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl; -import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration; -import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq.maven.InVMNodeManagerServer; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.FileDeploymentManager; +import org.apache.activemq.artemis.core.config.HAPolicyConfiguration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.config.impl.FileConfiguration; +import org.apache.activemq.artemis.core.config.impl.FileSecurityConfiguration; +import org.apache.activemq.artemis.core.config.impl.SecurityConfiguration; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.InVMNodeManager; +import org.apache.activemq.artemis.jms.server.JMSServerManager; +import org.apache.activemq.artemis.jms.server.config.JMSConfiguration; +import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration; +import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.maven.InVMNodeManagerServer; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl; /** * This will bootstrap the HornetQ Server and also the naming server if required diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedActiveMQBootstrap.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/SpawnedActiveMQBootstrap.java similarity index 96% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedActiveMQBootstrap.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/SpawnedActiveMQBootstrap.java index b44e5ede4f..6c23032483 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedActiveMQBootstrap.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/SpawnedActiveMQBootstrap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.server; +package org.apache.activemq.artemis.server; /** * This class will be spawned in a new vm and will call the bootstrap diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedVMSupport.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/SpawnedVMSupport.java similarity index 99% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedVMSupport.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/SpawnedVMSupport.java index 9f72bf8875..4cd069138a 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedVMSupport.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/SpawnedVMSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.server; +package org.apache.activemq.artemis.server; import java.io.BufferedReader; import java.io.File; diff --git a/activemq-native/README b/artemis-native/README similarity index 91% rename from activemq-native/README rename to artemis-native/README index 183742ee2d..645f880c2b 100644 --- a/activemq-native/README +++ b/artemis-native/README @@ -37,7 +37,7 @@ if you are missing any dependencies, autoconf would tell you what you're missing COMPILED FILE -The produced file will be under the ./target/nar (example: ./target/nar/activemq-native-6.0.0-amd64-Linux-gpp-jni/lib/amd64-Linux-gpp/jni/libactivemq-native-6.0.0.so) +The produced file will be under the ./target/nar (example: ./target/nar/artemis-native-6.0.0-amd64-Linux-gpp-jni/lib/amd64-Linux-gpp/jni/libartemis-native-6.0.0.so) and you will have to rename it manually under ./bin following the appropriate pattern. diff --git a/artemis-native/bin/libartemis-native-32.so b/artemis-native/bin/libartemis-native-32.so new file mode 100755 index 0000000000..060cd11098 Binary files /dev/null and b/artemis-native/bin/libartemis-native-32.so differ diff --git a/artemis-native/bin/libartemis-native-64.so b/artemis-native/bin/libartemis-native-64.so new file mode 100755 index 0000000000..1deebbca16 Binary files /dev/null and b/artemis-native/bin/libartemis-native-64.so differ diff --git a/activemq-native/compile-native.sh b/artemis-native/compile-native.sh similarity index 100% rename from activemq-native/compile-native.sh rename to artemis-native/compile-native.sh diff --git a/activemq-native/pom.xml b/artemis-native/pom.xml similarity index 87% rename from activemq-native/pom.xml rename to artemis-native/pom.xml index e690c5babb..b3bcdecfe9 100644 --- a/activemq-native/pom.xml +++ b/artemis-native/pom.xml @@ -20,16 +20,16 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-native + artemis-native ${native-package-type} org.apache.activemq - activemq-commons + artemis-commons ${project.version} @@ -56,7 +56,7 @@ bin/ - libactivemqAIO32.so + libartemisAIO32.so @@ -74,7 +74,7 @@ bin/ - libactivemqAIO64.so + libartemisAIO64.so @@ -95,12 +95,6 @@ - com.github.maven-nar nar-maven-plugin 3.0.0 @@ -123,7 +117,7 @@ jni - org.apache.activemq.core.libaio + org.apache.activemq.artemis.core.libaio diff --git a/activemq-native/src/main/c/AIOController.cpp b/artemis-native/src/main/c/AIOController.cpp similarity index 100% rename from activemq-native/src/main/c/AIOController.cpp rename to artemis-native/src/main/c/AIOController.cpp diff --git a/activemq-native/src/main/c/AIOController.h b/artemis-native/src/main/c/AIOController.h similarity index 100% rename from activemq-native/src/main/c/AIOController.h rename to artemis-native/src/main/c/AIOController.h diff --git a/activemq-native/src/main/c/AIOException.h b/artemis-native/src/main/c/AIOException.h similarity index 100% rename from activemq-native/src/main/c/AIOException.h rename to artemis-native/src/main/c/AIOException.h diff --git a/activemq-native/src/main/c/AsyncFile.cpp b/artemis-native/src/main/c/AsyncFile.cpp similarity index 100% rename from activemq-native/src/main/c/AsyncFile.cpp rename to artemis-native/src/main/c/AsyncFile.cpp diff --git a/activemq-native/src/main/c/AsyncFile.h b/artemis-native/src/main/c/AsyncFile.h similarity index 100% rename from activemq-native/src/main/c/AsyncFile.h rename to artemis-native/src/main/c/AsyncFile.h diff --git a/activemq-native/src/main/c/CallbackAdapter.h b/artemis-native/src/main/c/CallbackAdapter.h similarity index 100% rename from activemq-native/src/main/c/CallbackAdapter.h rename to artemis-native/src/main/c/CallbackAdapter.h diff --git a/activemq-native/src/main/c/JAIODatatypes.h b/artemis-native/src/main/c/JAIODatatypes.h similarity index 100% rename from activemq-native/src/main/c/JAIODatatypes.h rename to artemis-native/src/main/c/JAIODatatypes.h diff --git a/activemq-native/src/main/c/JNICallbackAdapter.cpp b/artemis-native/src/main/c/JNICallbackAdapter.cpp similarity index 100% rename from activemq-native/src/main/c/JNICallbackAdapter.cpp rename to artemis-native/src/main/c/JNICallbackAdapter.cpp diff --git a/activemq-native/src/main/c/JNICallbackAdapter.h b/artemis-native/src/main/c/JNICallbackAdapter.h similarity index 100% rename from activemq-native/src/main/c/JNICallbackAdapter.h rename to artemis-native/src/main/c/JNICallbackAdapter.h diff --git a/activemq-native/src/main/c/JNI_AsynchronousFileImpl.cpp b/artemis-native/src/main/c/JNI_AsynchronousFileImpl.cpp similarity index 83% rename from activemq-native/src/main/c/JNI_AsynchronousFileImpl.cpp rename to artemis-native/src/main/c/JNI_AsynchronousFileImpl.cpp index 2db78b2dc4..0334a7c0a2 100644 --- a/activemq-native/src/main/c/JNI_AsynchronousFileImpl.cpp +++ b/artemis-native/src/main/c/JNI_AsynchronousFileImpl.cpp @@ -25,7 +25,7 @@ #include #include -#include "org_apache_activemq_core_libaio_Native.h" +#include "org_apache_activemq_artemis_core_libaio_Native.h" #include "JavaUtilities.h" @@ -41,18 +41,18 @@ struct timespec nanoTime; inline AIOController * getController(JNIEnv *env, jobject & controllerAddress) { return (AIOController *) env->GetDirectBufferAddress(controllerAddress); -} +} /* Inaccessible static: log */ /* Inaccessible static: totalMaxIO */ /* Inaccessible static: loaded */ /* Inaccessible static: EXPECTED_NATIVE_VERSION */ /* - * Class: org.apache.activemq6_core_asyncio_impl_AsynchronousFileImpl + * Class: org.apache.activemq.artemis_core_asyncio_impl_AsynchronousFileImpl * Method: openFile * Signature: (Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_org_apache_activemq_core_libaio_Native_openFile +JNIEXPORT jint JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_openFile (JNIEnv * env , jclass , jstring jstrFileName) { std::string fileName = convertJavaString(env, jstrFileName); @@ -61,22 +61,22 @@ JNIEXPORT jint JNICALL Java_org_apache_activemq_core_libaio_Native_openFile } /* - * Class: org.apache.activemq6_core_asyncio_impl_AsynchronousFileImpl + * Class: org.apache.activemq.artemis_core_asyncio_impl_AsynchronousFileImpl * Method: closeFile * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_closeFile +JNIEXPORT void JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_closeFile (JNIEnv * , jclass , jint handle) { close(handle); } /* - * Class: org.apache.activemq6_core_asyncio_impl_AsynchronousFileImpl + * Class: org.apache.activemq.artemis_core_asyncio_impl_AsynchronousFileImpl * Method: flock * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_activemq_core_libaio_Native_flock +JNIEXPORT jboolean JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_flock (JNIEnv * , jclass , jint handle) { return flock(handle, LOCK_EX | LOCK_NB) == 0; @@ -89,7 +89,7 @@ JNIEXPORT jboolean JNICALL Java_org_apache_activemq_core_libaio_Native_flock * Method: init * Signature: (Ljava/lang/String;Ljava/lang/Class;)J */ -JNIEXPORT jobject JNICALL Java_org_apache_activemq_core_libaio_Native_init +JNIEXPORT jobject JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_init (JNIEnv * env, jclass, jclass controllerClazz, jstring jstrFileName, jint maxIO, jobject logger) { AIOController * controller = 0; @@ -98,14 +98,14 @@ JNIEXPORT jobject JNICALL Java_org_apache_activemq_core_libaio_Native_init std::string fileName = convertJavaString(env, jstrFileName); controller = new AIOController(fileName, (int) maxIO); - controller->done = env->GetMethodID(controllerClazz,"callbackDone","(Lorg/apache/activemq/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;)V"); + controller->done = env->GetMethodID(controllerClazz,"callbackDone","(Lorg/apache/activemq/artemis/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;)V"); if (!controller->done) { throwException (env, -1, "can't get callbackDone method"); return 0; } - controller->error = env->GetMethodID(controllerClazz, "callbackError", "(Lorg/apache/activemq/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;ILjava/lang/String;)V"); + controller->error = env->GetMethodID(controllerClazz, "callbackError", "(Lorg/apache/activemq/artemis/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;ILjava/lang/String;)V"); if (!controller->done) { throwException (env, -1, "can't get callbackError method"); @@ -137,7 +137,7 @@ JNIEXPORT jobject JNICALL Java_org_apache_activemq_core_libaio_Native_init * objThis here is passed as a parameter at the java layer. It used to be a JNI this and now it's a java static method where the intended reference is now passed as an argument */ -JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_read +JNIEXPORT void JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_read (JNIEnv *env, jclass, jobject objThis, jobject controllerAddress, jlong position, jlong size, jobject jbuffer, jobject callback) { try @@ -169,7 +169,7 @@ JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_read // Fast memset on buffer -JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_resetBuffer +JNIEXPORT void JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_resetBuffer (JNIEnv *env, jclass, jobject jbuffer, jint size) { void * buffer = env->GetDirectBufferAddress(jbuffer); @@ -184,7 +184,7 @@ JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_resetBuffer } -JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_destroyBuffer +JNIEXPORT void JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_destroyBuffer (JNIEnv * env, jclass, jobject jbuffer) { if (jbuffer == 0) @@ -196,7 +196,7 @@ JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_destroyBuffer free(buffer); } -JNIEXPORT jobject JNICALL Java_org_apache_activemq_core_libaio_Native_newNativeBuffer +JNIEXPORT jobject JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_newNativeBuffer (JNIEnv * env, jclass, jlong size) { try @@ -234,7 +234,7 @@ JNIEXPORT jobject JNICALL Java_org_apache_activemq_core_libaio_Native_newNativeB * objThis here is passed as a parameter at the java layer. It used to be a JNI this and now it's a java static method where the intended reference is now passed as an argument */ -JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_write +JNIEXPORT void JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_write (JNIEnv *env, jclass, jobject objThis, jobject controllerAddress, jlong sequence, jlong position, jlong size, jobject jbuffer, jobject callback) { try @@ -259,7 +259,7 @@ JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_write } } -JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_writeInternal +JNIEXPORT void JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_writeInternal (JNIEnv * env, jclass, jobject controllerAddress, jlong positionToWrite, jlong size, jobject jbuffer) { try @@ -282,7 +282,7 @@ JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_writeInternal } -JNIEXPORT void Java_org_apache_activemq_core_libaio_Native_internalPollEvents +JNIEXPORT void Java_org_apache_activemq_artemis_core_libaio_Native_internalPollEvents (JNIEnv *env, jclass, jobject controllerAddress) { try @@ -296,7 +296,7 @@ JNIEXPORT void Java_org_apache_activemq_core_libaio_Native_internalPollEvents } } -JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_stopPoller +JNIEXPORT void JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_stopPoller (JNIEnv *env, jclass, jobject controllerAddress) { try @@ -310,7 +310,7 @@ JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_stopPoller } } -JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_closeInternal +JNIEXPORT void JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_closeInternal (JNIEnv *env, jclass, jobject controllerAddress) { try @@ -326,7 +326,7 @@ JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_closeInternal } -JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_fill +JNIEXPORT void JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_fill (JNIEnv * env, jclass, jobject controllerAddress, jlong position, jint blocks, jlong size, jbyte fillChar) { try @@ -345,7 +345,7 @@ JNIEXPORT void JNICALL Java_org_apache_activemq_core_libaio_Native_fill /** It does nothing... just return true to make sure it has all the binary dependencies */ -JNIEXPORT jint JNICALL Java_org_apache_activemq_core_libaio_Native_getNativeVersion +JNIEXPORT jint JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_getNativeVersion (JNIEnv *, jclass) { @@ -353,7 +353,7 @@ JNIEXPORT jint JNICALL Java_org_apache_activemq_core_libaio_Native_getNativeVers } -JNIEXPORT jlong JNICALL Java_org_apache_activemq_core_libaio_Native_size0 +JNIEXPORT jlong JNICALL Java_org_apache_activemq_artemis_core_libaio_Native_size0 (JNIEnv * env, jclass, jobject controllerAddress) { try diff --git a/activemq-native/src/main/c/JavaUtilities.cpp b/artemis-native/src/main/c/JavaUtilities.cpp similarity index 95% rename from activemq-native/src/main/c/JavaUtilities.cpp rename to artemis-native/src/main/c/JavaUtilities.cpp index 1f6910749f..10d609924a 100644 --- a/activemq-native/src/main/c/JavaUtilities.cpp +++ b/artemis-native/src/main/c/JavaUtilities.cpp @@ -30,7 +30,7 @@ void throwRuntimeException(JNIEnv * env, const char * message) void throwException(JNIEnv * env, const int code, const char * message) { - jclass exceptionClass = env->FindClass("org/apache/activemq/api/core/ActiveMQException"); + jclass exceptionClass = env->FindClass("org/apache/activemq/artemis/api/core/ActiveMQException"); if (exceptionClass==NULL) { std::cerr << "Couldn't throw exception message:= " << message << "\n"; diff --git a/activemq-native/src/main/c/JavaUtilities.h b/artemis-native/src/main/c/JavaUtilities.h similarity index 100% rename from activemq-native/src/main/c/JavaUtilities.h rename to artemis-native/src/main/c/JavaUtilities.h diff --git a/activemq-native/src/main/c/LockClass.h b/artemis-native/src/main/c/LockClass.h similarity index 100% rename from activemq-native/src/main/c/LockClass.h rename to artemis-native/src/main/c/LockClass.h diff --git a/activemq-native/src/main/c/Version.h b/artemis-native/src/main/c/Version.h similarity index 88% rename from activemq-native/src/main/c/Version.h rename to artemis-native/src/main/c/Version.h index 6e020987b0..5b521b3aed 100644 --- a/activemq-native/src/main/c/Version.h +++ b/artemis-native/src/main/c/Version.h @@ -17,7 +17,7 @@ #ifndef _VERSION_NATIVE_AIO -// This definition needs to match org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl.EXPECTED_NATIVE_VERSION +// This definition needs to match org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl.EXPECTED_NATIVE_VERSION // Or else the native module won't be loaded because of version mismatches #define _VERSION_NATIVE_AIO 52 #endif diff --git a/activemq-native/src/main/java/org/apache/activemq/core/libaio/Native.java b/artemis-native/src/main/java/org/apache/activemq/artemis/core/libaio/Native.java similarity index 94% rename from activemq-native/src/main/java/org/apache/activemq/core/libaio/Native.java rename to artemis-native/src/main/java/org/apache/activemq/artemis/core/libaio/Native.java index bce218afaa..82f4188371 100644 --- a/activemq-native/src/main/java/org/apache/activemq/core/libaio/Native.java +++ b/artemis-native/src/main/java/org/apache/activemq/artemis/core/libaio/Native.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.libaio; +package org.apache.activemq.artemis.core.libaio; import java.nio.ByteBuffer; -import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQException; public class Native { @@ -53,7 +53,7 @@ public class Native public static native void writeInternal(ByteBuffer handle, long positionToWrite, long size, ByteBuffer bytes) throws ActiveMQException; /** - *This is using org.apache.activemq.core.asyncio.AIOCallback + *This is using org.apache.activemq.artemis.core.asyncio.AIOCallback */ public static native void read(Object thisObject, ByteBuffer handle, long position, long size, ByteBuffer buffer, Object aioPackageCallback) throws ActiveMQException; diff --git a/activemq-protocols/activemq-amqp-protocol/pom.xml b/artemis-protocols/artemis-amqp-protocol/pom.xml similarity index 87% rename from activemq-protocols/activemq-amqp-protocol/pom.xml rename to artemis-protocols/artemis-amqp-protocol/pom.xml index 66c542b5b5..2b488757e0 100644 --- a/activemq-protocols/activemq-amqp-protocol/pom.xml +++ b/artemis-protocols/artemis-amqp-protocol/pom.xml @@ -16,14 +16,13 @@ --> - activemq-protocols + artemis-protocols org.apache.activemq - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 - activemq-amqp-protocol - ActiveMQ Artemis AMQP Protocol + artemis-amqp-protocol ${project.basedir}/../.. @@ -33,12 +32,12 @@ org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} @@ -61,7 +60,7 @@ org.apache.activemq - activemq-commons + artemis-commons ${project.version} @@ -71,12 +70,12 @@ org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-proton-plug + artemis-proton-plug ${project.version} diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ActiveMQProtonRemotingConnection.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java similarity index 89% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ActiveMQProtonRemotingConnection.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java index 1dfe055e97..24a28a19a2 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ActiveMQProtonRemotingConnection.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton; +package org.apache.activemq.artemis.core.protocol.proton; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.client.ActiveMQClientLogger; -import org.apache.activemq.spi.core.protocol.AbstractRemotingConnection; -import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.client.ActiveMQClientLogger; +import org.apache.activemq.artemis.spi.core.protocol.AbstractRemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Connection; import org.proton.plug.AMQPConnectionContext; /** diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManager.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManager.java similarity index 74% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManager.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManager.java index dd88cab598..ef40eeb3c5 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManager.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManager.java @@ -14,29 +14,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton; +package org.apache.activemq.artemis.core.protocol.proton; import java.util.List; import java.util.concurrent.Executor; import io.netty.channel.ChannelPipeline; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.BaseInterceptor; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.core.protocol.proton.converter.ProtonMessageConverter; -import org.apache.activemq.core.protocol.proton.plug.ActiveMQProtonConnectionCallback; -import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.server.management.NotificationListener; -import org.apache.activemq.spi.core.protocol.ConnectionEntry; -import org.apache.activemq.spi.core.protocol.MessageConverter; -import org.apache.activemq.spi.core.protocol.ProtocolManager; -import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.BaseInterceptor; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.core.protocol.proton.converter.ProtonMessageConverter; +import org.apache.activemq.artemis.core.protocol.proton.plug.ActiveMQProtonConnectionCallback; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.server.management.NotificationListener; +import org.apache.activemq.artemis.spi.core.protocol.ConnectionEntry; +import org.apache.activemq.artemis.spi.core.protocol.MessageConverter; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.Connection; import org.proton.plug.AMQPServerConnectionContext; import org.proton.plug.context.server.ProtonServerConnectionContextFactory; diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManagerFactory.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManagerFactory.java similarity index 80% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManagerFactory.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManagerFactory.java index 6fe25765ca..541a4b404f 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManagerFactory.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManagerFactory.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton; +package org.apache.activemq.artemis.core.protocol.proton; -import org.apache.activemq.api.core.BaseInterceptor; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.spi.core.protocol.AbstractProtocolManagerFactory; -import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.api.core.BaseInterceptor; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.spi.core.protocol.AbstractProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; import java.util.Collections; import java.util.List; diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ActiveMQJMSVendor.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java similarity index 72% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ActiveMQJMSVendor.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java index e675b98831..683641f5f1 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ActiveMQJMSVendor.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton.converter; +package org.apache.activemq.artemis.core.protocol.proton.converter; import javax.jms.BytesMessage; import javax.jms.Destination; @@ -25,15 +25,15 @@ import javax.jms.StreamMessage; import javax.jms.TextMessage; import org.apache.qpid.proton.jms.JMSVendor; -import org.apache.activemq.core.buffers.impl.ResetLimitWrappedActiveMQBuffer; -import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSBytesMessage; -import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSMapMessage; -import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSMessage; -import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSStreamMessage; -import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSTextMessage; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.utils.IDGenerator; +import org.apache.activemq.artemis.core.buffers.impl.ResetLimitWrappedActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSBytesMessage; +import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSMapMessage; +import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSMessage; +import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSStreamMessage; +import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSTextMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.utils.IDGenerator; public class ActiveMQJMSVendor extends JMSVendor { @@ -48,25 +48,25 @@ public class ActiveMQJMSVendor extends JMSVendor @Override public BytesMessage createBytesMessage() { - return new ServerJMSBytesMessage(newMessage(org.apache.activemq.api.core.Message.BYTES_TYPE), 0); + return new ServerJMSBytesMessage(newMessage(org.apache.activemq.artemis.api.core.Message.BYTES_TYPE), 0); } @Override public StreamMessage createStreamMessage() { - return new ServerJMSStreamMessage(newMessage(org.apache.activemq.api.core.Message.STREAM_TYPE), 0); + return new ServerJMSStreamMessage(newMessage(org.apache.activemq.artemis.api.core.Message.STREAM_TYPE), 0); } @Override public Message createMessage() { - return new ServerJMSMessage(newMessage(org.apache.activemq.api.core.Message.DEFAULT_TYPE), 0 ); + return new ServerJMSMessage(newMessage(org.apache.activemq.artemis.api.core.Message.DEFAULT_TYPE), 0 ); } @Override public TextMessage createTextMessage() { - return new ServerJMSTextMessage(newMessage(org.apache.activemq.api.core.Message.TEXT_TYPE), 0); + return new ServerJMSTextMessage(newMessage(org.apache.activemq.artemis.api.core.Message.TEXT_TYPE), 0); } @Override @@ -78,7 +78,7 @@ public class ActiveMQJMSVendor extends JMSVendor @Override public MapMessage createMapMessage() { - return new ServerJMSMapMessage(newMessage(org.apache.activemq.api.core.Message.MAP_TYPE), 0); + return new ServerJMSMapMessage(newMessage(org.apache.activemq.artemis.api.core.Message.MAP_TYPE), 0); } @Override @@ -121,13 +121,13 @@ public class ActiveMQJMSVendor extends JMSVendor { switch (messageType) { - case org.apache.activemq.api.core.Message.STREAM_TYPE: + case org.apache.activemq.artemis.api.core.Message.STREAM_TYPE: return new ServerJMSStreamMessage(wrapped, deliveryCount); - case org.apache.activemq.api.core.Message.BYTES_TYPE: + case org.apache.activemq.artemis.api.core.Message.BYTES_TYPE: return new ServerJMSBytesMessage(wrapped, deliveryCount); - case org.apache.activemq.api.core.Message.MAP_TYPE: + case org.apache.activemq.artemis.api.core.Message.MAP_TYPE: return new ServerJMSMapMessage(wrapped, deliveryCount); - case org.apache.activemq.api.core.Message.TEXT_TYPE: + case org.apache.activemq.artemis.api.core.Message.TEXT_TYPE: return new ServerJMSTextMessage(wrapped, deliveryCount); default: return new ServerJMSMessage(wrapped, deliveryCount); diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ProtonMessageConverter.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ProtonMessageConverter.java similarity index 88% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ProtonMessageConverter.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ProtonMessageConverter.java index 2f65675f29..81a74695af 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ProtonMessageConverter.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ProtonMessageConverter.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton.converter; +package org.apache.activemq.artemis.core.protocol.proton.converter; import org.apache.qpid.proton.jms.EncodedMessage; import org.apache.qpid.proton.jms.InboundTransformer; import org.apache.qpid.proton.jms.JMSMappingInboundTransformer; import org.apache.qpid.proton.jms.JMSMappingOutboundTransformer; -import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSMessage; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.spi.core.protocol.MessageConverter; -import org.apache.activemq.utils.IDGenerator; +import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.spi.core.protocol.MessageConverter; +import org.apache.activemq.artemis.utils.IDGenerator; public class ProtonMessageConverter implements MessageConverter { diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java similarity index 68% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java index b60191c6de..0854671803 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java @@ -14,38 +14,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton.converter.jms; +package org.apache.activemq.artemis.core.protocol.proton.converter.jms; import javax.jms.BytesMessage; import javax.jms.JMSException; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; -import static org.apache.activemq.reader.BytesMessageUtil.bytesMessageReset; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadBoolean; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadByte; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadBytes; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadChar; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadDouble; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadFloat; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadInt; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadLong; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadShort; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUTF; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUnsignedByte; -import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUnsignedShort; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteBoolean; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteByte; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteBytes; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteChar; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteDouble; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteFloat; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteInt; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteLong; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteObject; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteShort; -import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteUTF; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesMessageReset; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadBoolean; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadByte; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadBytes; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadChar; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadDouble; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadFloat; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadInt; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadLong; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadShort; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadUTF; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadUnsignedByte; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesReadUnsignedShort; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteBoolean; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteByte; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteBytes; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteChar; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteDouble; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteFloat; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteInt; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteLong; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteObject; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteShort; +import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteUTF; public class ServerJMSBytesMessage extends ServerJMSMessage implements BytesMessage { diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java similarity index 93% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java index a117c0f111..11b5b13185 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton.converter.jms; +package org.apache.activemq.artemis.core.protocol.proton.converter.jms; import javax.jms.JMSException; import javax.jms.MapMessage; @@ -24,14 +24,14 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; -import org.apache.activemq.api.core.ActiveMQPropertyConversionException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.utils.TypedProperties; -import static org.apache.activemq.reader.MapMessageUtil.readBodyMap; -import static org.apache.activemq.reader.MapMessageUtil.writeBodyMap; +import static org.apache.activemq.artemis.reader.MapMessageUtil.readBodyMap; +import static org.apache.activemq.artemis.reader.MapMessageUtil.writeBodyMap; /** * ActiveMQ implementation of a JMS MapMessage. diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java similarity index 95% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMessage.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java index 7d38065c27..40c7621689 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMessage.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton.converter.jms; +package org.apache.activemq.artemis.core.protocol.proton.converter.jms; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -23,12 +23,12 @@ import javax.jms.Message; import java.util.Collections; import java.util.Enumeration; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.jms.client.ActiveMQQueue; -import org.apache.activemq.reader.MessageUtil; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.jms.client.ActiveMQQueue; +import org.apache.activemq.artemis.reader.MessageUtil; public class ServerJMSMessage implements Message { diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java similarity index 87% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java index 73d1b69900..cf85ca33d0 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java @@ -14,31 +14,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton.converter.jms; +package org.apache.activemq.artemis.core.protocol.proton.converter.jms; import javax.jms.JMSException; import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; import javax.jms.StreamMessage; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.utils.DataConstants; -import static org.apache.activemq.reader.MessageUtil.getBodyBuffer; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadBoolean; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadByte; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadBytes; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadChar; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadDouble; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadFloat; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadInteger; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadLong; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadObject; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadShort; -import static org.apache.activemq.reader.StreamMessageUtil.streamReadString; +import static org.apache.activemq.artemis.reader.MessageUtil.getBodyBuffer; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadBoolean; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadByte; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadBytes; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadChar; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadDouble; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadFloat; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadInteger; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadLong; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadObject; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadShort; +import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadString; public final class ServerJMSStreamMessage extends ServerJMSMessage implements StreamMessage { diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java similarity index 86% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java index c8796f95ba..05aa81af94 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton.converter.jms; +package org.apache.activemq.artemis.core.protocol.proton.converter.jms; import javax.jms.JMSException; import javax.jms.TextMessage; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; -import static org.apache.activemq.reader.TextMessageUtil.readBodyText; -import static org.apache.activemq.reader.TextMessageUtil.writeBodyText; +import static org.apache.activemq.artemis.reader.TextMessageUtil.readBodyText; +import static org.apache.activemq.artemis.reader.TextMessageUtil.writeBodyText; /** diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/package-info.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/package-info.java new file mode 100644 index 0000000000..f4dcbc6a16 --- /dev/null +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/package-info.java @@ -0,0 +1,17 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.artemis.core.protocol.proton.converter.jms; \ No newline at end of file diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java similarity index 87% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java index 4d83dacd08..52bc316a6a 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton.plug; +package org.apache.activemq.artemis.core.protocol.proton.plug; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; @@ -22,12 +22,12 @@ import java.util.concurrent.TimeUnit; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; -import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; -import org.apache.activemq.core.protocol.proton.ActiveMQProtonRemotingConnection; -import org.apache.activemq.core.protocol.proton.ProtonProtocolManager; -import org.apache.activemq.core.protocol.proton.sasl.ActiveMQPlainSASL; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.utils.ReusableLatch; +import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq.artemis.core.protocol.proton.ActiveMQProtonRemotingConnection; +import org.apache.activemq.artemis.core.protocol.proton.ProtonProtocolManager; +import org.apache.activemq.artemis.core.protocol.proton.sasl.ActiveMQPlainSASL; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.utils.ReusableLatch; import org.proton.plug.AMQPConnectionCallback; import org.proton.plug.AMQPConnectionContext; import org.proton.plug.AMQPSessionCallback; diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java similarity index 92% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java index 6aedd25e08..9e60be4585 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton.plug; +package org.apache.activemq.artemis.core.protocol.proton.plug; import java.util.concurrent.Executor; @@ -28,20 +28,20 @@ import org.apache.qpid.proton.engine.Link; import org.apache.qpid.proton.engine.Receiver; import org.apache.qpid.proton.jms.EncodedMessage; import org.apache.qpid.proton.message.ProtonJMessage; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.protocol.proton.ProtonProtocolManager; -import org.apache.activemq.core.server.QueueQueryResult; -import org.apache.activemq.core.server.ServerConsumer; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.ServerSession; -import org.apache.activemq.spi.core.protocol.SessionCallback; -import org.apache.activemq.spi.core.remoting.ReadyListener; -import org.apache.activemq.utils.ByteUtil; -import org.apache.activemq.utils.IDGenerator; -import org.apache.activemq.utils.SimpleIDGenerator; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.protocol.proton.ProtonProtocolManager; +import org.apache.activemq.artemis.core.server.QueueQueryResult; +import org.apache.activemq.artemis.core.server.ServerConsumer; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.ServerSession; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.spi.core.remoting.ReadyListener; +import org.apache.activemq.artemis.utils.ByteUtil; +import org.apache.activemq.artemis.utils.IDGenerator; +import org.apache.activemq.artemis.utils.SimpleIDGenerator; +import org.apache.activemq.artemis.utils.UUIDGenerator; import org.proton.plug.AMQPConnectionContext; import org.proton.plug.AMQPSessionCallback; import org.proton.plug.AMQPSessionContext; diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/package-info.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/package-info.java new file mode 100644 index 0000000000..455b5bb241 --- /dev/null +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/package-info.java @@ -0,0 +1,17 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.artemis.core.protocol.proton.plug; \ No newline at end of file diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/sasl/ActiveMQPlainSASL.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/sasl/ActiveMQPlainSASL.java similarity index 87% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/sasl/ActiveMQPlainSASL.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/sasl/ActiveMQPlainSASL.java index 966ffb4596..cb21ea02cf 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/sasl/ActiveMQPlainSASL.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/sasl/ActiveMQPlainSASL.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton.sasl; +package org.apache.activemq.artemis.core.protocol.proton.sasl; -import org.apache.activemq.core.security.SecurityStore; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.core.security.SecurityStore; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; import org.proton.plug.sasl.ServerSASLPlain; public class ActiveMQPlainSASL extends ServerSASLPlain diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/resources/META-INF/services/org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory b/artemis-protocols/artemis-amqp-protocol/src/main/resources/META-INF/services/org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory new file mode 100644 index 0000000000..2cd27f44f8 --- /dev/null +++ b/artemis-protocols/artemis-amqp-protocol/src/main/resources/META-INF/services/org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory @@ -0,0 +1 @@ +org.apache.activemq.artemis.core.protocol.proton.ProtonProtocolManagerFactory \ No newline at end of file diff --git a/activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq/core/protocol/proton/TestConversions.java b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/proton/TestConversions.java similarity index 94% rename from activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq/core/protocol/proton/TestConversions.java rename to artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/proton/TestConversions.java index 9195b530f7..830b38b088 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq/core/protocol/proton/TestConversions.java +++ b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/core/protocol/proton/TestConversions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.proton; +package org.apache.activemq.artemis.core.protocol.proton; import java.nio.ByteBuffer; import java.util.HashMap; @@ -24,7 +24,7 @@ import java.util.Map; import io.netty.buffer.ByteBuf; import io.netty.buffer.PooledByteBufAllocator; -import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.qpid.proton.amqp.Binary; import org.apache.qpid.proton.amqp.messaging.AmqpSequence; import org.apache.qpid.proton.amqp.messaging.AmqpValue; @@ -34,16 +34,16 @@ import org.apache.qpid.proton.jms.EncodedMessage; import org.apache.qpid.proton.message.Message; import org.apache.qpid.proton.message.ProtonJMessage; import org.apache.qpid.proton.message.impl.MessageImpl; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.protocol.proton.converter.ProtonMessageConverter; -import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSBytesMessage; -import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSMapMessage; -import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSMessage; -import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSStreamMessage; -import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSTextMessage; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.utils.SimpleIDGenerator; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.protocol.proton.converter.ProtonMessageConverter; +import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSBytesMessage; +import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSMapMessage; +import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSMessage; +import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSStreamMessage; +import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSTextMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.utils.SimpleIDGenerator; import org.junit.Assert; import org.junit.Test; import org.proton.plug.util.NettyWritable; diff --git a/activemq-protocols/activemq-openwire-protocol/pom.xml b/artemis-protocols/artemis-openwire-protocol/pom.xml similarity index 84% rename from activemq-protocols/activemq-openwire-protocol/pom.xml rename to artemis-protocols/artemis-openwire-protocol/pom.xml index b81c87f794..4c60e90d5b 100644 --- a/activemq-protocols/activemq-openwire-protocol/pom.xml +++ b/artemis-protocols/artemis-openwire-protocol/pom.xml @@ -16,17 +16,16 @@ --> - activemq-protocols + artemis-protocols org.apache.activemq - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 - activemq-openwire-protocol - ActiveMQ Artemis OpenWire Protocol + artemis-openwire-protocol - ${project.parent.parent.basedir} + ${project.basedir}/../.. @@ -54,12 +53,12 @@ org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQConnectorImpl.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java similarity index 90% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQConnectorImpl.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java index 98eb096f4b..e6ccd0e2e5 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQConnectorImpl.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire; +package org.apache.activemq.artemis.core.protocol.openwire; import org.apache.activemq.command.BrokerInfo; import org.apache.activemq.command.ConnectionControl; -import org.apache.activemq.core.protocol.openwire.amq.AMQConnector; -import org.apache.activemq.core.protocol.openwire.amq.AMQConnectorStatistics; -import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQConnector; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQConnectorStatistics; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; public class AMQConnectorImpl implements AMQConnector { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQTransactionImpl.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQTransactionImpl.java similarity index 84% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQTransactionImpl.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQTransactionImpl.java index 393bd9da1e..c9924878ef 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQTransactionImpl.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQTransactionImpl.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire; +package org.apache.activemq.artemis.core.protocol.openwire; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.impl.RefsOperation; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.impl.RefsOperation; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; import javax.transaction.xa.Xid; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/BrokerState.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/BrokerState.java similarity index 93% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/BrokerState.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/BrokerState.java index 33a9dc5e8b..44ab3a7042 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/BrokerState.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/BrokerState.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire; +package org.apache.activemq.artemis.core.protocol.openwire; /** * The class holds related states of an activemq broker. diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/DataInputWrapper.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/DataInputWrapper.java similarity index 96% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/DataInputWrapper.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/DataInputWrapper.java index c3f341dd00..d9fd6d785f 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/DataInputWrapper.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/DataInputWrapper.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire; +package org.apache.activemq.artemis.core.protocol.openwire; import java.io.DataInput; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.utils.UTF8Util; -import org.apache.activemq.utils.UTF8Util.StringUtilBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.utils.UTF8Util; +import org.apache.activemq.artemis.utils.UTF8Util.StringUtilBuffer; public class DataInputWrapper implements DataInput { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/NotEnoughBytesException.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/NotEnoughBytesException.java similarity index 94% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/NotEnoughBytesException.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/NotEnoughBytesException.java index c01fdff375..29813d07ca 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/NotEnoughBytesException.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/NotEnoughBytesException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire; +package org.apache.activemq.artemis.core.protocol.openwire; import java.io.IOException; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java similarity index 96% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java index b0963817e6..b7258c3c3c 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire; +package org.apache.activemq.artemis.core.protocol.openwire; import javax.jms.InvalidDestinationException; import javax.jms.JMSSecurityException; @@ -34,12 +34,12 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; -import org.apache.activemq.api.core.ActiveMQSecurityException; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException; +import org.apache.activemq.artemis.api.core.ActiveMQSecurityException; +import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMessage; import org.apache.activemq.command.BrokerInfo; @@ -74,24 +74,24 @@ import org.apache.activemq.command.ShutdownInfo; import org.apache.activemq.command.TransactionId; import org.apache.activemq.command.TransactionInfo; import org.apache.activemq.command.WireFormatInfo; -import org.apache.activemq.core.protocol.openwire.amq.AMQBrokerStoppedException; -import org.apache.activemq.core.protocol.openwire.amq.AMQConnectionContext; -import org.apache.activemq.core.protocol.openwire.amq.AMQConsumerBrokerExchange; -import org.apache.activemq.core.protocol.openwire.amq.AMQMapTransportConnectionStateRegister; -import org.apache.activemq.core.protocol.openwire.amq.AMQMessageAuthorizationPolicy; -import org.apache.activemq.core.protocol.openwire.amq.AMQProducerBrokerExchange; -import org.apache.activemq.core.protocol.openwire.amq.AMQSession; -import org.apache.activemq.core.protocol.openwire.amq.AMQSingleTransportConnectionStateRegister; -import org.apache.activemq.core.protocol.openwire.amq.AMQTransaction; -import org.apache.activemq.core.protocol.openwire.amq.AMQTransportConnectionState; -import org.apache.activemq.core.protocol.openwire.amq.AMQTransportConnectionStateRegister; -import org.apache.activemq.core.remoting.CloseListener; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQBrokerStoppedException; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQConnectionContext; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQConsumerBrokerExchange; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQMapTransportConnectionStateRegister; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQMessageAuthorizationPolicy; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQProducerBrokerExchange; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQSession; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQSingleTransportConnectionStateRegister; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQTransaction; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQTransportConnectionState; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQTransportConnectionStateRegister; +import org.apache.activemq.artemis.core.remoting.CloseListener; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; import org.apache.activemq.openwire.OpenWireFormat; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.Connection; import org.apache.activemq.state.CommandVisitor; import org.apache.activemq.state.ConnectionState; import org.apache.activemq.state.ConsumerState; @@ -101,7 +101,7 @@ import org.apache.activemq.thread.TaskRunner; import org.apache.activemq.thread.TaskRunnerFactory; import org.apache.activemq.transport.TransmitCallback; import org.apache.activemq.util.ByteSequence; -import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; import org.apache.activemq.wireformat.WireFormat; /** diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireMessageConverter.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java similarity index 93% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireMessageConverter.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java index 85dad42ece..421b1a2aa8 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireMessageConverter.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire; +package org.apache.activemq.artemis.core.protocol.openwire; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -28,8 +28,8 @@ import java.util.Map.Entry; import javax.jms.JMSException; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQPropertyConversionException; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException; import org.apache.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMapMessage; @@ -51,14 +51,14 @@ import org.apache.activemq.util.ByteSequence; import org.apache.activemq.util.MarshallingSupport; import org.apache.activemq.wireformat.WireFormat; import org.fusesource.hawtbuf.UTF8Buffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.openwire.amq.AMQConsumer; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.spi.core.protocol.MessageConverter; -import org.apache.activemq.utils.DataConstants; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQConsumer; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.spi.core.protocol.MessageConverter; +import org.apache.activemq.artemis.utils.DataConstants; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.UUIDGenerator; public class OpenWireMessageConverter implements MessageConverter { @@ -125,14 +125,14 @@ public class OpenWireMessageConverter implements MessageConverter ActiveMQBuffer body = coreMessage.getBodyBuffer(); switch (coreType) { - case org.apache.activemq.api.core.Message.TEXT_TYPE: + case org.apache.activemq.artemis.api.core.Message.TEXT_TYPE: ByteArrayInputStream tis = new ByteArrayInputStream(contents); DataInputStream tdataIn = new DataInputStream(tis); String text = MarshallingSupport.readUTF8(tdataIn); tdataIn.close(); body.writeNullableSimpleString(new SimpleString(text)); break; - case org.apache.activemq.api.core.Message.MAP_TYPE: + case org.apache.activemq.artemis.api.core.Message.MAP_TYPE: InputStream mis = new ByteArrayInputStream(contents); DataInputStream mdataIn = new DataInputStream(mis); Map map = MarshallingSupport.unmarshalPrimitiveMap(mdataIn); @@ -141,11 +141,11 @@ public class OpenWireMessageConverter implements MessageConverter loadMapIntoProperties(props, map); props.encode(body); break; - case org.apache.activemq.api.core.Message.OBJECT_TYPE: + case org.apache.activemq.artemis.api.core.Message.OBJECT_TYPE: body.writeInt(contents.length); body.writeBytes(contents.data, contents.offset, contents.length); break; - case org.apache.activemq.api.core.Message.STREAM_TYPE: + case org.apache.activemq.artemis.api.core.Message.STREAM_TYPE: InputStream sis = new ByteArrayInputStream(contents); DataInputStream sdis = new DataInputStream(sis); int stype = sdis.read(); @@ -388,17 +388,17 @@ public class OpenWireMessageConverter implements MessageConverter case CommandTypes.ACTIVEMQ_BLOB_MESSAGE: throw new IllegalStateException("We don't support BLOB type yet!"); case CommandTypes.ACTIVEMQ_BYTES_MESSAGE: - return org.apache.activemq.api.core.Message.BYTES_TYPE; + return org.apache.activemq.artemis.api.core.Message.BYTES_TYPE; case CommandTypes.ACTIVEMQ_MAP_MESSAGE: - return org.apache.activemq.api.core.Message.MAP_TYPE; + return org.apache.activemq.artemis.api.core.Message.MAP_TYPE; case CommandTypes.ACTIVEMQ_OBJECT_MESSAGE: - return org.apache.activemq.api.core.Message.OBJECT_TYPE; + return org.apache.activemq.artemis.api.core.Message.OBJECT_TYPE; case CommandTypes.ACTIVEMQ_STREAM_MESSAGE: - return org.apache.activemq.api.core.Message.STREAM_TYPE; + return org.apache.activemq.artemis.api.core.Message.STREAM_TYPE; case CommandTypes.ACTIVEMQ_TEXT_MESSAGE: - return org.apache.activemq.api.core.Message.TEXT_TYPE; + return org.apache.activemq.artemis.api.core.Message.TEXT_TYPE; case CommandTypes.ACTIVEMQ_MESSAGE: - return org.apache.activemq.api.core.Message.DEFAULT_TYPE; + return org.apache.activemq.artemis.api.core.Message.DEFAULT_TYPE; default: throw new IllegalStateException("Unknown ActiveMQ message type: " + amqType); } @@ -425,22 +425,22 @@ public class OpenWireMessageConverter implements MessageConverter byte coreType = coreMessage.getType(); switch (coreType) { - case org.apache.activemq.api.core.Message.BYTES_TYPE: + case org.apache.activemq.artemis.api.core.Message.BYTES_TYPE: amqMsg = new ActiveMQBytesMessage(); break; - case org.apache.activemq.api.core.Message.MAP_TYPE: + case org.apache.activemq.artemis.api.core.Message.MAP_TYPE: amqMsg = new ActiveMQMapMessage(); break; - case org.apache.activemq.api.core.Message.OBJECT_TYPE: + case org.apache.activemq.artemis.api.core.Message.OBJECT_TYPE: amqMsg = new ActiveMQObjectMessage(); break; - case org.apache.activemq.api.core.Message.STREAM_TYPE: + case org.apache.activemq.artemis.api.core.Message.STREAM_TYPE: amqMsg = new ActiveMQStreamMessage(); break; - case org.apache.activemq.api.core.Message.TEXT_TYPE: + case org.apache.activemq.artemis.api.core.Message.TEXT_TYPE: amqMsg = new ActiveMQTextMessage(); break; - case org.apache.activemq.api.core.Message.DEFAULT_TYPE: + case org.apache.activemq.artemis.api.core.Message.DEFAULT_TYPE: amqMsg = new ActiveMQMessage(); break; default: @@ -471,7 +471,7 @@ public class OpenWireMessageConverter implements MessageConverter byte[] bytes = null; synchronized (buffer) { - if (coreType == org.apache.activemq.api.core.Message.TEXT_TYPE) + if (coreType == org.apache.activemq.artemis.api.core.Message.TEXT_TYPE) { SimpleString text = buffer.readNullableSimpleString(); @@ -484,7 +484,7 @@ public class OpenWireMessageConverter implements MessageConverter out.close(); } } - else if (coreType == org.apache.activemq.api.core.Message.MAP_TYPE) + else if (coreType == org.apache.activemq.artemis.api.core.Message.MAP_TYPE) { TypedProperties mapData = new TypedProperties(); mapData.decode(buffer); @@ -496,13 +496,13 @@ public class OpenWireMessageConverter implements MessageConverter bytes = out.toByteArray(); dataOut.close(); } - else if (coreType == org.apache.activemq.api.core.Message.OBJECT_TYPE) + else if (coreType == org.apache.activemq.artemis.api.core.Message.OBJECT_TYPE) { int len = buffer.readInt(); bytes = new byte[len]; buffer.readBytes(bytes); } - else if (coreType == org.apache.activemq.api.core.Message.STREAM_TYPE) + else if (coreType == org.apache.activemq.artemis.api.core.Message.STREAM_TYPE) { ByteArrayOutputStream out = new ByteArrayOutputStream(buffer.readableBytes()); DataOutputStream dataOut = new DataOutputStream(out); diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java similarity index 93% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java index 74d7d77487..bf2ff294a4 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire; +package org.apache.activemq.artemis.core.protocol.openwire; import javax.jms.InvalidClientIDException; import java.util.ArrayList; @@ -30,10 +30,10 @@ import java.util.concurrent.CopyOnWriteArrayList; import io.netty.channel.ChannelPipeline; import org.apache.activemq.advisory.AdvisorySupport; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.BaseInterceptor; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.BaseInterceptor; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQTopic; @@ -55,28 +55,28 @@ import org.apache.activemq.command.TransactionId; import org.apache.activemq.command.TransactionInfo; import org.apache.activemq.command.WireFormatInfo; import org.apache.activemq.command.XATransactionId; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.protocol.openwire.amq.AMQConnectionContext; -import org.apache.activemq.core.protocol.openwire.amq.AMQPersistenceAdapter; -import org.apache.activemq.core.protocol.openwire.amq.AMQProducerBrokerExchange; -import org.apache.activemq.core.protocol.openwire.amq.AMQServerSession; -import org.apache.activemq.core.protocol.openwire.amq.AMQSession; -import org.apache.activemq.core.protocol.openwire.amq.AMQTransportConnectionState; -import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq.core.security.CheckType; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQConnectionContext; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQPersistenceAdapter; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQProducerBrokerExchange; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQServerSession; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQSession; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQTransportConnectionState; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.artemis.core.security.CheckType; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; import org.apache.activemq.openwire.OpenWireFormat; import org.apache.activemq.openwire.OpenWireFormatFactory; -import org.apache.activemq.spi.core.protocol.ConnectionEntry; -import org.apache.activemq.spi.core.protocol.MessageConverter; -import org.apache.activemq.spi.core.protocol.ProtocolManager; -import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.spi.core.protocol.ConnectionEntry; +import org.apache.activemq.artemis.spi.core.protocol.MessageConverter; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; import org.apache.activemq.state.ConnectionState; import org.apache.activemq.state.ProducerState; import org.apache.activemq.state.SessionState; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManagerFactory.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManagerFactory.java similarity index 79% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManagerFactory.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManagerFactory.java index 5593ee6200..8e88ea18f0 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManagerFactory.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManagerFactory.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire; +package org.apache.activemq.artemis.core.protocol.openwire; import java.util.Collections; import java.util.List; -import org.apache.activemq.api.core.BaseInterceptor; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.spi.core.protocol.AbstractProtocolManagerFactory; -import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.api.core.BaseInterceptor; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.spi.core.protocol.AbstractProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; public class OpenWireProtocolManagerFactory extends AbstractProtocolManagerFactory { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireUtil.java similarity index 82% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireUtil.java index 6163dfe306..738b055eb2 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireUtil.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire; +package org.apache.activemq.artemis.core.protocol.openwire; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; import org.apache.activemq.command.ActiveMQDestination; -import org.apache.activemq.core.protocol.openwire.amq.AMQServerSession; -import org.apache.activemq.core.protocol.openwire.amq.AMQSession; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.BindingQueryResult; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQServerSession; +import org.apache.activemq.artemis.core.protocol.openwire.amq.AMQSession; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.BindingQueryResult; import org.apache.activemq.util.ByteSequence; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; public class OpenWireUtil { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/SendingResult.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/SendingResult.java similarity index 86% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/SendingResult.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/SendingResult.java index a6eb5313ff..9207db4346 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/SendingResult.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/SendingResult.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire; +package org.apache.activemq.artemis.core.protocol.openwire; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.paging.impl.PagingStoreImpl; -import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.paging.impl.PagingStoreImpl; +import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; public class SendingResult { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java similarity index 97% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java index 16430da272..3c51a66886 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import org.apache.activemq.ActiveMQMessageAudit; import org.apache.activemq.command.Message; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQBrokerStoppedException.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQBrokerStoppedException.java similarity index 95% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQBrokerStoppedException.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQBrokerStoppedException.java index d0c5439cdf..6b470f05d4 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQBrokerStoppedException.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQBrokerStoppedException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; public class AMQBrokerStoppedException extends IllegalStateException { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectionContext.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnectionContext.java similarity index 97% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectionContext.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnectionContext.java index ad78d901bd..785fc9129d 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectionContext.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnectionContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.io.IOException; import java.util.concurrent.ConcurrentHashMap; @@ -28,8 +28,8 @@ import org.apache.activemq.command.WireFormatInfo; import org.apache.activemq.command.XATransactionId; import org.apache.activemq.filter.MessageEvaluationContext; import org.apache.activemq.state.ConnectionState; -import org.apache.activemq.core.protocol.openwire.OpenWireConnection; -import org.apache.activemq.core.protocol.openwire.OpenWireProtocolManager; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireProtocolManager; public class AMQConnectionContext { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnector.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnector.java similarity index 93% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnector.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnector.java index df5d3e52ad..1182485a53 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnector.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnector.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import org.apache.activemq.command.BrokerInfo; import org.apache.activemq.command.ConnectionControl; -import org.apache.activemq.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireConnection; public interface AMQConnector { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectorStatistics.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnectorStatistics.java similarity index 98% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectorStatistics.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnectorStatistics.java index 4804fbbed9..d170a4051e 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectorStatistics.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnectorStatistics.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import org.apache.activemq.management.CountStatisticImpl; import org.apache.activemq.management.PollCountStatisticImpl; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumer.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java similarity index 96% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumer.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java index eb343dc944..ccf893cb4c 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumer.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.io.IOException; import java.util.Iterator; @@ -30,12 +30,12 @@ import org.apache.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageId; import org.apache.activemq.command.TransactionId; import org.apache.activemq.wireformat.WireFormat; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.openwire.OpenWireMessageConverter; -import org.apache.activemq.core.protocol.openwire.OpenWireUtil; -import org.apache.activemq.core.server.QueueQueryResult; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireMessageConverter; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireUtil; +import org.apache.activemq.artemis.core.server.QueueQueryResult; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; public class AMQConsumer implements BrowserListener { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java similarity index 97% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java index 8ac5d717a3..7c14160a69 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; public class AMQConsumerBrokerExchange { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQDeadLetterStrategy.java similarity index 97% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQDeadLetterStrategy.java index cb9756496f..d8f6ee20a7 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQDeadLetterStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.Message; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestination.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQDestination.java similarity index 99% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestination.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQDestination.java index 5997a7d52c..d2230e29c0 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestination.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQDestination.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.io.IOException; import java.util.List; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestinationStatistics.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQDestinationStatistics.java similarity index 99% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestinationStatistics.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQDestinationStatistics.java index bc17ebe250..016dc82d65 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestinationStatistics.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQDestinationStatistics.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import org.apache.activemq.management.CountStatisticImpl; import org.apache.activemq.management.PollCountStatisticImpl; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java similarity index 98% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java index c0e0d5f191..b7335931df 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.util.ArrayList; import java.util.HashMap; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java similarity index 94% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java index 4b424996d4..14ef595aeb 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import org.apache.activemq.command.Message; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageStore.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMessageStore.java similarity index 92% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageStore.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMessageStore.java index 3e9db13d30..ffab22f23d 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageStore.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQMessageStore.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; public interface AMQMessageStore { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQPersistenceAdapter.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQPersistenceAdapter.java similarity index 96% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQPersistenceAdapter.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQPersistenceAdapter.java index b0e444d875..bcfb890d21 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQPersistenceAdapter.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQPersistenceAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.io.IOException; import java.util.Set; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQProducer.java similarity index 90% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQProducer.java index 89cfd85888..ef5ea59ea6 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQProducer.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import org.apache.activemq.command.ProducerInfo; -import org.apache.activemq.core.protocol.openwire.OpenWireUtil; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireUtil; public class AMQProducer { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQProducerBrokerExchange.java similarity index 99% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQProducerBrokerExchange.java index 42d5f04ba7..d21a121702 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQProducerBrokerExchange.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSecurityContext.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSecurityContext.java similarity index 97% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSecurityContext.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSecurityContext.java index 4b7211d9f4..79aef8d601 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSecurityContext.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSecurityContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.security.Principal; import java.util.Collections; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerConsumer.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerConsumer.java similarity index 86% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerConsumer.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerConsumer.java index b629f62b43..3e4159224a 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerConsumer.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerConsumer.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.util.List; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.QueueBinding; -import org.apache.activemq.core.protocol.openwire.OpenWireMessageConverter; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.HandleStatus; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.QueueImpl; -import org.apache.activemq.core.server.impl.ServerConsumerImpl; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.QueueBinding; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireMessageConverter; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.HandleStatus; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.QueueImpl; +import org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; public class AMQServerConsumer extends ServerConsumerImpl { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSession.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerSession.java similarity index 85% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSession.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerSession.java index 171034c965..61799c3eb2 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSession.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerSession.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.util.ArrayList; import java.util.HashMap; @@ -26,39 +26,39 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.filter.impl.FilterImpl; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.QueueBinding; -import org.apache.activemq.core.protocol.openwire.AMQTransactionImpl; -import org.apache.activemq.core.security.SecurityStore; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.QueueCreator; -import org.apache.activemq.core.server.ServerConsumer; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.RefsOperation; -import org.apache.activemq.core.server.impl.ServerConsumerImpl; -import org.apache.activemq.core.server.impl.ServerSessionImpl; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.protocol.SessionCallback; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.UUID; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.filter.impl.FilterImpl; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.QueueBinding; +import org.apache.activemq.artemis.core.protocol.openwire.AMQTransactionImpl; +import org.apache.activemq.artemis.core.security.SecurityStore; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.QueueCreator; +import org.apache.activemq.artemis.core.server.ServerConsumer; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.RefsOperation; +import org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl; +import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.UUID; public class AMQServerSession extends ServerSessionImpl { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSessionFactory.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerSessionFactory.java similarity index 67% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSessionFactory.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerSessionFactory.java index 908eded798..302ba1d4b7 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSessionFactory.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerSessionFactory.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.security.SecurityStore; -import org.apache.activemq.core.server.QueueCreator; -import org.apache.activemq.core.server.ServerSessionFactory; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.ServerSessionImpl; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.security.SecurityStore; +import org.apache.activemq.artemis.core.server.QueueCreator; +import org.apache.activemq.artemis.core.server.ServerSessionFactory; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; public class AMQServerSessionFactory implements ServerSessionFactory { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java similarity index 94% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java index b692183b4c..57f39a8d01 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import javax.transaction.xa.Xid; import java.io.IOException; @@ -29,7 +29,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ConnectionInfo; import org.apache.activemq.command.ConsumerId; @@ -46,20 +46,20 @@ import org.apache.activemq.command.SessionInfo; import org.apache.activemq.command.TransactionId; import org.apache.activemq.command.TransactionInfo; import org.apache.activemq.command.XATransactionId; -import org.apache.activemq.core.paging.impl.PagingStoreImpl; -import org.apache.activemq.core.protocol.openwire.OpenWireConnection; -import org.apache.activemq.core.protocol.openwire.OpenWireMessageConverter; -import org.apache.activemq.core.protocol.openwire.OpenWireProtocolManager; -import org.apache.activemq.core.protocol.openwire.OpenWireUtil; -import org.apache.activemq.core.protocol.openwire.SendingResult; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ServerConsumer; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.core.transaction.impl.XidImpl; -import org.apache.activemq.spi.core.protocol.SessionCallback; -import org.apache.activemq.spi.core.remoting.ReadyListener; +import org.apache.activemq.artemis.core.paging.impl.PagingStoreImpl; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireMessageConverter; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireProtocolManager; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireUtil; +import org.apache.activemq.artemis.core.protocol.openwire.SendingResult; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ServerConsumer; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.core.transaction.impl.XidImpl; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.spi.core.remoting.ReadyListener; import org.apache.activemq.wireformat.WireFormat; public class AMQSession implements SessionCallback diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java similarity index 96% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java index 6c1e29ec16..fff134114e 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java similarity index 98% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java index 808f26c998..1e2f5d23c7 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.util.ArrayList; import java.util.HashMap; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java similarity index 95% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java index 0c09b77b80..e428046255 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; public interface AMQSlowConsumerStrategy { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscription.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscription.java similarity index 99% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscription.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscription.java index 9df3fd1259..d3c37a3475 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscription.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscription.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.io.IOException; import java.util.List; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscriptionRecovery.java similarity index 95% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscriptionRecovery.java index 2695b59c4d..78db617c28 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscriptionRecovery.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import org.apache.activemq.broker.region.MessageReference; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransaction.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransaction.java similarity index 99% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransaction.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransaction.java index f6c2a4434b..61253c27eb 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransaction.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransaction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.io.IOException; import java.io.InterruptedIOException; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransactionFactory.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransactionFactory.java similarity index 76% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransactionFactory.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransactionFactory.java index 69eebb61f5..05a9109fa7 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransactionFactory.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransactionFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import javax.transaction.xa.Xid; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.protocol.openwire.AMQTransactionImpl; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionFactory; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.protocol.openwire.AMQTransactionImpl; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionFactory; public class AMQTransactionFactory implements TransactionFactory { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionState.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransportConnectionState.java similarity index 94% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionState.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransportConnectionState.java index 35c00ba4b7..7f24503b9a 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionState.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransportConnectionState.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.command.ConnectionInfo; import org.apache.activemq.state.ConnectionState; -import org.apache.activemq.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq.artemis.core.protocol.openwire.OpenWireConnection; /** * @See org.apache.activemq.broker.TransportConnectionState diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java similarity index 96% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java index a62a0ff83a..9d34a8b994 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import java.util.List; import java.util.Map; diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/BrowserListener.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/BrowserListener.java similarity index 93% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/BrowserListener.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/BrowserListener.java index abef808f35..5572a82732 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/BrowserListener.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/BrowserListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; interface BrowserListener { diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/MessageInfo.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/MessageInfo.java similarity index 95% rename from activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/MessageInfo.java rename to artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/MessageInfo.java index c2fedac006..196c61c730 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/MessageInfo.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/MessageInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.openwire.amq; +package org.apache.activemq.artemis.core.protocol.openwire.amq; import org.apache.activemq.command.MessageId; diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/resources/META-INF/services/org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory b/artemis-protocols/artemis-openwire-protocol/src/main/resources/META-INF/services/org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory new file mode 100644 index 0000000000..9b7fda42a7 --- /dev/null +++ b/artemis-protocols/artemis-openwire-protocol/src/main/resources/META-INF/services/org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory @@ -0,0 +1 @@ +org.apache.activemq.artemis.core.protocol.openwire.OpenWireProtocolManagerFactory diff --git a/activemq-protocols/activemq-proton-plug/pom.xml b/artemis-protocols/artemis-proton-plug/pom.xml similarity index 89% rename from activemq-protocols/activemq-proton-plug/pom.xml rename to artemis-protocols/artemis-proton-plug/pom.xml index b4ee9d20bc..13b7280e16 100644 --- a/activemq-protocols/activemq-proton-plug/pom.xml +++ b/artemis-protocols/artemis-proton-plug/pom.xml @@ -16,14 +16,13 @@ --> - activemq-protocols + artemis-protocols org.apache.activemq - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 - activemq-proton-plug - ActiveMQ Artemis Proton Plug + artemis-proton-plug ${project.basedir}/../.. @@ -33,12 +32,12 @@ org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} @@ -62,7 +61,7 @@ org.apache.activemq - activemq-commons + artemis-commons ${project.version} test @@ -73,7 +72,7 @@ org.apache.activemq - activemq-server + artemis-server ${project.version} diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPClientConnectionContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPClientReceiverContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPClientSenderContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPClientSessionContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPConnectionCallback.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPServerConnectionContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPSessionCallback.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPSessionContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/ClientSASL.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/ClientSASL.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/ClientSASL.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/ClientSASL.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/SASLResult.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/SASLResult.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/SASLResult.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/SASLResult.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/ServerSASL.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/ServerSASL.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/ServerSASL.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/ServerSASL.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonInitializable.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonPlugSender.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPException.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPException.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPException.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPException.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPIllegalStateException.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPIllegalStateException.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPIllegalStateException.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPIllegalStateException.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPInternalErrorException.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPInternalErrorException.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPInternalErrorException.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPInternalErrorException.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPInvalidFieldException.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPInvalidFieldException.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPInvalidFieldException.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPInvalidFieldException.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPNotImplementedException.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPNotImplementedException.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPNotImplementedException.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPNotImplementedException.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPTimeoutException.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPTimeoutException.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPTimeoutException.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPTimeoutException.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/EventHandler.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/Events.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/Events.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/Events.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/Events.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/ProtonHandler.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/PlainSASLResult.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ByteUtil.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/CodecCache.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/CreditsSemaphore.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/DebugInfo.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/DeliveryUtil.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/NettyWritable.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java rename to artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/context/AbstractConnectionContextTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/context/AbstractConnectionContextTest.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/context/AbstractConnectionContextTest.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/context/AbstractConnectionContextTest.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/Constants.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/Constants.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/Constants.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/Constants.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/Connector.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java diff --git a/activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java similarity index 100% rename from activemq-protocols/activemq-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java rename to artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java diff --git a/activemq-protocols/activemq-stomp-protocol/pom.xml b/artemis-protocols/artemis-stomp-protocol/pom.xml similarity index 88% rename from activemq-protocols/activemq-stomp-protocol/pom.xml rename to artemis-protocols/artemis-stomp-protocol/pom.xml index 91438de188..9aa61f4d77 100644 --- a/activemq-protocols/activemq-stomp-protocol/pom.xml +++ b/artemis-protocols/artemis-stomp-protocol/pom.xml @@ -16,14 +16,13 @@ --> - activemq-protocols + artemis-protocols org.apache.activemq - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 - activemq-stomp-protocol - ActiveMQ Artemis STOMP Protocol + artemis-stomp-protocol ${project.basedir}/../.. @@ -46,7 +45,7 @@ org.apache.activemq - activemq-server + artemis-server ${project.version} diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompException.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompException.java similarity index 98% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompException.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompException.java index 0f795c494d..91f45a89a0 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompException.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolLogger.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolLogger.java similarity index 97% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolLogger.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolLogger.java index 1cceeebea8..bbfe283c77 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolLogger.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolLogger.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java similarity index 98% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java index 6879f7d7ba..03ad8f4222 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; -import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/FrameEventListener.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/FrameEventListener.java similarity index 94% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/FrameEventListener.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/FrameEventListener.java index f52f213a0c..6c8ed39fee 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/FrameEventListener.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/FrameEventListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; public interface FrameEventListener { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/SimpleBytes.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/SimpleBytes.java similarity index 96% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/SimpleBytes.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/SimpleBytes.java index ffaf46c2ba..600d78a687 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/SimpleBytes.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/SimpleBytes.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import java.nio.charset.StandardCharsets; diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/Stomp.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java similarity index 98% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/Stomp.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java index ab7e363733..c5ec1a73fc 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/Stomp.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; /** * The standard verbs and headers used for the STOMP protocol. diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompCommands.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompCommands.java similarity index 95% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompCommands.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompCommands.java index afe07c17e7..73d28aebd7 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompCommands.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompCommands.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; public enum StompCommands { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompConnection.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java similarity index 93% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompConnection.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java index 26ce7cdfeb..8f2c08a4df 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompConnection.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import java.util.ArrayList; import java.util.Collections; @@ -24,27 +24,27 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.concurrent.CopyOnWriteArrayList; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.management.ResourceNames; -import org.apache.activemq.core.protocol.stomp.v10.StompFrameHandlerV10; -import org.apache.activemq.core.protocol.stomp.v12.StompFrameHandlerV12; -import org.apache.activemq.core.remoting.CloseListener; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.utils.ConfigurationHelper; -import org.apache.activemq.utils.VersionLoader; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.management.ResourceNames; +import org.apache.activemq.artemis.core.protocol.stomp.v10.StompFrameHandlerV10; +import org.apache.activemq.artemis.core.protocol.stomp.v12.StompFrameHandlerV12; +import org.apache.activemq.artemis.core.remoting.CloseListener; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.utils.ConfigurationHelper; +import org.apache.activemq.artemis.utils.VersionLoader; -import static org.apache.activemq.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; public final class StompConnection implements RemotingConnection { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompDecoder.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java similarity index 98% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompDecoder.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java index 05db95375f..3c4f744b9e 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompDecoder.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; -import static org.apache.activemq.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; public class StompDecoder { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrame.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrame.java similarity index 97% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrame.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrame.java index e475c54613..e525621ce1 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrame.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrame.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; /** * Represents all the data in a STOMP frame. diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrameInterceptor.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java similarity index 90% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrameInterceptor.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java index 619c29fe67..a807aee540 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrameInterceptor.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; -import org.apache.activemq.api.core.BaseInterceptor; +import org.apache.activemq.artemis.api.core.BaseInterceptor; /** * This class is a simple way to intercepting client calls on ActiveMQ using STOMP protocol. diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java similarity index 89% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java index a2a8b44711..47651c926f 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -26,38 +26,38 @@ import java.util.Set; import java.util.concurrent.Executor; import io.netty.channel.ChannelPipeline; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.BaseInterceptor; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ServerSession; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.server.management.NotificationListener; -import org.apache.activemq.spi.core.protocol.ConnectionEntry; -import org.apache.activemq.spi.core.protocol.MessageConverter; -import org.apache.activemq.spi.core.protocol.ProtocolManager; -import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.BaseInterceptor; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ServerSession; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.server.management.NotificationListener; +import org.apache.activemq.artemis.spi.core.protocol.ConnectionEntry; +import org.apache.activemq.artemis.spi.core.protocol.MessageConverter; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.UUIDGenerator; -import static org.apache.activemq.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; /** * StompProtocolManager diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManagerFactory.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManagerFactory.java similarity index 83% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManagerFactory.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManagerFactory.java index 1edf561857..713df84fc9 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManagerFactory.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManagerFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import java.util.List; -import org.apache.activemq.api.core.BaseInterceptor; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.spi.core.protocol.AbstractProtocolManagerFactory; -import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.api.core.BaseInterceptor; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.spi.core.protocol.AbstractProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; public class StompProtocolManagerFactory extends AbstractProtocolManagerFactory { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSession.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java similarity index 88% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSession.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java index a2bb079d8f..8fabbfbd52 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSession.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import java.util.Iterator; import java.util.Map; @@ -22,30 +22,30 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.zip.Inflater; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.message.BodyEncoder; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.persistence.impl.journal.LargeServerMessageImpl; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.QueueQueryResult; -import org.apache.activemq.core.server.ServerConsumer; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.ServerSession; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.core.server.impl.ServerSessionImpl; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.protocol.SessionCallback; -import org.apache.activemq.spi.core.remoting.ReadyListener; -import org.apache.activemq.utils.ConfigurationHelper; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.message.BodyEncoder; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageImpl; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.QueueQueryResult; +import org.apache.activemq.artemis.core.server.ServerConsumer; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.ServerSession; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.spi.core.remoting.ReadyListener; +import org.apache.activemq.artemis.utils.ConfigurationHelper; +import org.apache.activemq.artemis.utils.UUIDGenerator; -import static org.apache.activemq.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; public class StompSession implements SessionCallback { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSubscription.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSubscription.java similarity index 97% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSubscription.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSubscription.java index a56d682923..19b421b36c 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSubscription.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSubscription.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; public class StompSubscription { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompUtils.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java similarity index 93% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompUtils.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java index c3ff56f571..ba058e880d 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompUtils.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.impl.ClientMessageImpl; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; public class StompUtils { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompVersions.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompVersions.java similarity index 94% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompVersions.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompVersions.java index c353736a01..8af6fc7eb2 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompVersions.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompVersions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; /** * Stomp Spec Versions diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/VersionedStompFrameHandler.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java similarity index 92% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/VersionedStompFrameHandler.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java index 18c6038fce..0e5442688f 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/VersionedStompFrameHandler.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import java.nio.charset.StandardCharsets; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.protocol.stomp.Stomp.Headers; -import org.apache.activemq.core.protocol.stomp.v10.StompFrameHandlerV10; -import org.apache.activemq.core.protocol.stomp.v11.StompFrameHandlerV11; -import org.apache.activemq.core.protocol.stomp.v12.StompFrameHandlerV12; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.protocol.stomp.Stomp.Headers; +import org.apache.activemq.artemis.core.protocol.stomp.v10.StompFrameHandlerV10; +import org.apache.activemq.artemis.core.protocol.stomp.v11.StompFrameHandlerV11; +import org.apache.activemq.artemis.core.protocol.stomp.v12.StompFrameHandlerV12; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.utils.DataConstants; -import static org.apache.activemq.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; public abstract class VersionedStompFrameHandler { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameHandlerV10.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v10/StompFrameHandlerV10.java similarity index 86% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameHandlerV10.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v10/StompFrameHandlerV10.java index 3ce103d079..d249a51608 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameHandlerV10.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v10/StompFrameHandlerV10.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp.v10; +package org.apache.activemq.artemis.core.protocol.stomp.v10; import java.util.Map; -import org.apache.activemq.core.protocol.stomp.FrameEventListener; -import org.apache.activemq.core.protocol.stomp.ActiveMQStompException; -import org.apache.activemq.core.protocol.stomp.Stomp; -import org.apache.activemq.core.protocol.stomp.StompConnection; -import org.apache.activemq.core.protocol.stomp.StompDecoder; -import org.apache.activemq.core.protocol.stomp.StompFrame; -import org.apache.activemq.core.protocol.stomp.VersionedStompFrameHandler; -import org.apache.activemq.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.protocol.stomp.FrameEventListener; +import org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompException; +import org.apache.activemq.artemis.core.protocol.stomp.Stomp; +import org.apache.activemq.artemis.core.protocol.stomp.StompConnection; +import org.apache.activemq.artemis.core.protocol.stomp.StompDecoder; +import org.apache.activemq.artemis.core.protocol.stomp.StompFrame; +import org.apache.activemq.artemis.core.protocol.stomp.VersionedStompFrameHandler; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; -import static org.apache.activemq.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; public class StompFrameHandlerV10 extends VersionedStompFrameHandler implements FrameEventListener { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameV10.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v10/StompFrameV10.java similarity index 87% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameV10.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v10/StompFrameV10.java index e8d203dc54..f9bfd1f98a 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameV10.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v10/StompFrameV10.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp.v10; +package org.apache.activemq.artemis.core.protocol.stomp.v10; -import org.apache.activemq.core.protocol.stomp.StompFrame; +import org.apache.activemq.artemis.core.protocol.stomp.StompFrame; public class StompFrameV10 extends StompFrame { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameHandlerV11.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java similarity index 96% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameHandlerV11.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java index 42559d8361..a077b013db 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameHandlerV11.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp.v11; +package org.apache.activemq.artemis.core.protocol.stomp.v11; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.core.protocol.stomp.ActiveMQStompException; -import org.apache.activemq.core.protocol.stomp.FrameEventListener; -import org.apache.activemq.core.protocol.stomp.SimpleBytes; -import org.apache.activemq.core.protocol.stomp.Stomp; -import org.apache.activemq.core.protocol.stomp.StompConnection; -import org.apache.activemq.core.protocol.stomp.StompDecoder; -import org.apache.activemq.core.protocol.stomp.StompFrame; -import org.apache.activemq.core.protocol.stomp.VersionedStompFrameHandler; -import org.apache.activemq.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompException; +import org.apache.activemq.artemis.core.protocol.stomp.FrameEventListener; +import org.apache.activemq.artemis.core.protocol.stomp.SimpleBytes; +import org.apache.activemq.artemis.core.protocol.stomp.Stomp; +import org.apache.activemq.artemis.core.protocol.stomp.StompConnection; +import org.apache.activemq.artemis.core.protocol.stomp.StompDecoder; +import org.apache.activemq.artemis.core.protocol.stomp.StompFrame; +import org.apache.activemq.artemis.core.protocol.stomp.VersionedStompFrameHandler; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; -import static org.apache.activemq.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; public class StompFrameHandlerV11 extends VersionedStompFrameHandler implements FrameEventListener { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameV11.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameV11.java similarity index 90% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameV11.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameV11.java index e08e269af9..0a7b3e9ae9 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameV11.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameV11.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp.v11; +package org.apache.activemq.artemis.core.protocol.stomp.v11; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.core.protocol.stomp.Stomp; -import org.apache.activemq.core.protocol.stomp.StompFrame; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.core.protocol.stomp.Stomp; +import org.apache.activemq.artemis.core.protocol.stomp.StompFrame; public class StompFrameV11 extends StompFrame { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameHandlerV12.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java similarity index 90% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameHandlerV12.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java index 3c58ac7498..eef4878bd1 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameHandlerV12.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp.v12; +package org.apache.activemq.artemis.core.protocol.stomp.v12; -import org.apache.activemq.core.protocol.stomp.FrameEventListener; -import org.apache.activemq.core.protocol.stomp.ActiveMQStompException; -import org.apache.activemq.core.protocol.stomp.Stomp; -import org.apache.activemq.core.protocol.stomp.StompConnection; -import org.apache.activemq.core.protocol.stomp.StompDecoder; -import org.apache.activemq.core.protocol.stomp.StompFrame; -import org.apache.activemq.core.protocol.stomp.StompSubscription; -import org.apache.activemq.core.protocol.stomp.v11.StompFrameHandlerV11; -import org.apache.activemq.core.protocol.stomp.v11.StompFrameV11; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.artemis.core.protocol.stomp.FrameEventListener; +import org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompException; +import org.apache.activemq.artemis.core.protocol.stomp.Stomp; +import org.apache.activemq.artemis.core.protocol.stomp.StompConnection; +import org.apache.activemq.artemis.core.protocol.stomp.StompDecoder; +import org.apache.activemq.artemis.core.protocol.stomp.StompFrame; +import org.apache.activemq.artemis.core.protocol.stomp.StompSubscription; +import org.apache.activemq.artemis.core.protocol.stomp.v11.StompFrameHandlerV11; +import org.apache.activemq.artemis.core.protocol.stomp.v11.StompFrameV11; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ServerMessage; -import static org.apache.activemq.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompProtocolMessageBundle.BUNDLE; public class StompFrameHandlerV12 extends StompFrameHandlerV11 implements FrameEventListener { diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameV12.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameV12.java similarity index 90% rename from activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameV12.java rename to artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameV12.java index d65081c0a2..1016bda008 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameV12.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameV12.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp.v12; +package org.apache.activemq.artemis.core.protocol.stomp.v12; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.core.protocol.stomp.Stomp; -import org.apache.activemq.core.protocol.stomp.StompFrame; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.core.protocol.stomp.Stomp; +import org.apache.activemq.artemis.core.protocol.stomp.StompFrame; public class StompFrameV12 extends StompFrame { diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/resources/META-INF/services/org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory b/artemis-protocols/artemis-stomp-protocol/src/main/resources/META-INF/services/org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory new file mode 100644 index 0000000000..223d9bd444 --- /dev/null +++ b/artemis-protocols/artemis-stomp-protocol/src/main/resources/META-INF/services/org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory @@ -0,0 +1 @@ +org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory \ No newline at end of file diff --git a/activemq-protocols/pom.xml b/artemis-protocols/pom.xml similarity index 78% rename from activemq-protocols/pom.xml rename to artemis-protocols/pom.xml index 69650fc60e..4434430bd3 100644 --- a/activemq-protocols/pom.xml +++ b/artemis-protocols/pom.xml @@ -17,14 +17,13 @@ --> - activemq-pom + artemis-pom org.apache.activemq - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 - activemq-protocols - ActiveMQ Artemis Protocols + artemis-protocols pom @@ -32,10 +31,10 @@ - activemq-amqp-protocol - activemq-stomp-protocol - activemq-openwire-protocol - activemq-proton-plug + artemis-amqp-protocol + artemis-stomp-protocol + artemis-openwire-protocol + artemis-proton-plug diff --git a/activemq-ra/pom.xml b/artemis-ra/pom.xml similarity index 89% rename from activemq-ra/pom.xml rename to artemis-ra/pom.xml index 755416bbfb..b3dcbc08c4 100644 --- a/activemq-ra/pom.xml +++ b/artemis-ra/pom.xml @@ -20,11 +20,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-ra + artemis-ra jar @@ -48,19 +48,19 @@ org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} provided org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} provided org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} provided @@ -83,7 +83,7 @@ org.apache.activemq - activemq-service-extensions + artemis-service-extensions ${project.version} diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java similarity index 95% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java index 7b06c72ac8..d3b56181ba 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; -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; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABytesMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABytesMessage.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java index 75b8f2977b..ec65020c1b 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABytesMessage.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import java.util.Arrays; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionFactory.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactory.java similarity index 94% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionFactory.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactory.java index 64404ad125..1dfc7fdc73 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionFactory.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.XAQueueConnectionFactory; import javax.jms.XATopicConnectionFactory; @@ -22,7 +22,7 @@ import javax.resource.Referenceable; import javax.resource.ResourceException; import java.io.Serializable; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; /** * An aggregate interface for the JMS connection factories diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionFactoryImpl.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java similarity index 98% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionFactoryImpl.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java index 92e5d1d594..5fbb2f1c9c 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionFactoryImpl.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.Connection; import javax.jms.JMSContext; @@ -34,9 +34,9 @@ import javax.naming.Reference; import javax.resource.ResourceException; import javax.resource.spi.ConnectionManager; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.jms.referenceable.ConnectionFactoryObjectFactory; -import org.apache.activemq.jms.referenceable.SerializableObjectRefAddr; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.referenceable.ConnectionFactoryObjectFactory; +import org.apache.activemq.artemis.jms.referenceable.SerializableObjectRefAddr; /** * The connection factory diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionManager.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java similarity index 96% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionManager.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java index 39c598b676..0a6ce96799 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionManager.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.resource.ResourceException; import javax.resource.spi.ConnectionManager; @@ -22,7 +22,7 @@ import javax.resource.spi.ConnectionRequestInfo; import javax.resource.spi.ManagedConnection; import javax.resource.spi.ManagedConnectionFactory; -import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; /** diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionMetaData.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java similarity index 98% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionMetaData.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java index bb1cc83105..9a45b5c506 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionMetaData.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import java.util.Enumeration; import java.util.Vector; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionRequestInfo.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionRequestInfo.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionRequestInfo.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionRequestInfo.java index 804c1672d2..c74c3ff9a5 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAConnectionRequestInfo.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionRequestInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.Session; import javax.resource.spi.ConnectionRequestInfo; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRACredential.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRACredential.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java index cb13478bb8..37cc4d26a6 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRACredential.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import java.io.Serializable; import java.security.AccessController; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAJMSContext.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAJMSContext.java similarity index 87% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAJMSContext.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAJMSContext.java index 23a475089b..e3882b17a5 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAJMSContext.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAJMSContext.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; -import org.apache.activemq.jms.client.ActiveMQConnectionForContext; -import org.apache.activemq.jms.client.ActiveMQJMSContext; -import org.apache.activemq.jms.client.ThreadAwareContext; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionForContext; +import org.apache.activemq.artemis.jms.client.ActiveMQJMSContext; +import org.apache.activemq.artemis.jms.client.ThreadAwareContext; import javax.jms.ExceptionListener; import javax.jms.JMSContext; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRALocalTransaction.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java similarity index 98% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRALocalTransaction.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java index 76599ea65a..7be1d7e040 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRALocalTransaction.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.JMSException; import javax.resource.ResourceException; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRALogger.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java similarity index 97% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRALogger.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java index a90153abc8..fcdc357e45 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRALogger.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; -import org.apache.activemq.ra.inflow.ActiveMQActivationSpec; +import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMCFProperties.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMCFProperties.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMCFProperties.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMCFProperties.java index 1c53013969..6bc12a32cc 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMCFProperties.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMCFProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import java.io.Serializable; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAManagedConnection.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java similarity index 97% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAManagedConnection.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java index 72caf91053..abfe9462f1 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAManagedConnection.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.ExceptionListener; import javax.jms.JMSException; @@ -48,13 +48,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.core.client.impl.ClientSessionInternal; -import org.apache.activemq.jms.client.ActiveMQConnection; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQXAConnection; -import org.apache.activemq.service.extensions.ServiceUtils; -import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapper; -import org.apache.activemq.utils.VersionLoader; +import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; +import org.apache.activemq.artemis.jms.client.ActiveMQConnection; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQXAConnection; +import org.apache.activemq.artemis.service.extensions.ServiceUtils; +import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapper; +import org.apache.activemq.artemis.utils.VersionLoader; /** * The managed connection diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAManagedConnectionFactory.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAManagedConnectionFactory.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java index 42546c44e6..f722bfcb37 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAManagedConnectionFactory.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.ConnectionMetaData; import javax.resource.ResourceException; @@ -29,8 +29,8 @@ import java.io.PrintWriter; import java.util.Iterator; import java.util.Set; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.service.extensions.xa.recovery.XARecoveryConfig; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConfig; /** * ActiveMQ ManagedConnectionFactory diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMapMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMapMessage.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java index 73ef393fee..8a8a3fad04 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMapMessage.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import java.util.Arrays; import java.util.Enumeration; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessage.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java index df633b1063..1e85695749 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessage.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.Destination; import javax.jms.JMSException; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessageConsumer.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessageConsumer.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java index c5aee7700e..d002ced64e 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessageConsumer.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.BytesMessage; import javax.jms.JMSException; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessageListener.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java similarity index 98% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessageListener.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java index 5dae6f9f43..2cf9ad1b6b 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessageListener.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.Message; import javax.jms.MessageListener; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessageProducer.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessageProducer.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java index c769bf7b54..230a080010 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMessageProducer.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.CompletionListener; import javax.jms.Destination; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMetaData.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java similarity index 98% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMetaData.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java index 66a025ce23..fbcc8f27c3 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAMetaData.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.resource.ResourceException; import javax.resource.spi.ManagedConnectionMetaData; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAObjectMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java similarity index 98% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAObjectMessage.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java index 1e92163f55..ffa2a44064 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAObjectMessage.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import java.io.Serializable; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAProperties.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java similarity index 95% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAProperties.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java index 48cb10d7ea..76e3c562b8 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAProperties.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAProperties.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import java.io.Serializable; import java.util.Hashtable; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.utils.DefaultSensitiveStringCodec; -import org.apache.activemq.utils.PasswordMaskingUtil; -import org.apache.activemq.utils.SensitiveDataCodec; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec; +import org.apache.activemq.artemis.utils.PasswordMaskingUtil; +import org.apache.activemq.artemis.utils.SensitiveDataCodec; /** diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAQueueReceiver.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java similarity index 97% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAQueueReceiver.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java index 2692d3ddd9..3918108804 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAQueueReceiver.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.JMSException; import javax.jms.Queue; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAQueueSender.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAQueueSender.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java index 09914209fd..0271360819 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAQueueSender.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.JMSException; import javax.jms.Message; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAService.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java similarity index 98% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAService.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java index 0eab375ed9..3c7f95ff68 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAService.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import java.util.Set; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRASession.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRASession.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java index cdfa0c6f23..9b36e9a972 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRASession.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.BytesMessage; import javax.jms.Destination; @@ -53,8 +53,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.jms.client.ActiveMQSession; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.jms.client.ActiveMQSession; /** diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRASessionFactory.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactory.java similarity index 97% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRASessionFactory.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactory.java index baf2fbc024..f0c365b7ed 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRASessionFactory.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.JMSException; import javax.jms.TemporaryQueue; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRASessionFactoryImpl.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java similarity index 96% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRASessionFactoryImpl.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java index 2f09674e73..1ddd1fb693 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRASessionFactoryImpl.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.ConnectionConsumer; import javax.jms.ConnectionMetaData; @@ -45,9 +45,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.activemq.api.jms.ActiveMQJMSConstants; -import org.apache.activemq.jms.client.ActiveMQConnectionForContext; -import org.apache.activemq.jms.client.ActiveMQConnectionForContextImpl; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionForContext; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionForContextImpl; /** * Implements the JMS Connection API and produces {@link ActiveMQRASession} objects. @@ -294,7 +294,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon ActiveMQRALogger.LOGGER.trace("setClientID(" + cID + ")"); } - throw new IllegalStateException(ActiveMQRASessionFactory.ISE); + throw new IllegalStateException(ISE); } /** @@ -373,7 +373,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon ")"); } - throw new IllegalStateException(ActiveMQRASessionFactory.ISE); + throw new IllegalStateException(ISE); } /** @@ -452,7 +452,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon ")"); } - throw new IllegalStateException(ActiveMQRASessionFactory.ISE); + throw new IllegalStateException(ISE); } /** @@ -487,7 +487,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon ")"); } - throw new IllegalStateException(ActiveMQRASessionFactory.ISE); + throw new IllegalStateException(ISE); } /** @@ -513,7 +513,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon ")"); } - throw new IllegalStateException(ActiveMQRASessionFactory.ISE); + throw new IllegalStateException(ISE); } /** @@ -544,7 +544,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon ")"); } - throw new IllegalStateException(ActiveMQRASessionFactory.ISE); + throw new IllegalStateException(ISE); } /** @@ -616,7 +616,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon ActiveMQRALogger.LOGGER.trace("getExceptionListener()"); } - throw new IllegalStateException(ActiveMQRASessionFactory.ISE); + throw new IllegalStateException(ISE); } /** @@ -633,7 +633,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon ActiveMQRALogger.LOGGER.trace("setExceptionListener(" + listener + ")"); } - throw new IllegalStateException(ActiveMQRASessionFactory.ISE); + throw new IllegalStateException(ISE); } /** @@ -679,7 +679,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon ActiveMQRALogger.LOGGER.trace("stop() " + this); } - throw new IllegalStateException(ActiveMQRASessionFactory.ISE); + throw new IllegalStateException(ISE); } /** @@ -838,7 +838,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon messageSelector + ", " + sessionPool + ", " + maxMessages + ")"); } - throw new IllegalStateException(ActiveMQRASessionFactory.ISE); + throw new IllegalStateException(ISE); } @Override @@ -850,7 +850,7 @@ public final class ActiveMQRASessionFactoryImpl extends ActiveMQConnectionForCon ", " + messageSelector + ", " + sessionPool + ", " + maxMessages + ")"); } - throw new IllegalStateException(ActiveMQRASessionFactory.ISE); + throw new IllegalStateException(ISE); } /** diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAStreamMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAStreamMessage.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java index 27c166263b..7e3d50482a 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAStreamMessage.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAStreamMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import java.util.Arrays; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRATextMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATextMessage.java similarity index 98% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRATextMessage.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATextMessage.java index 74dc310960..f8e4b13a38 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRATextMessage.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATextMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.JMSException; import javax.jms.TextMessage; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRATopicPublisher.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicPublisher.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRATopicPublisher.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicPublisher.java index 23351fc5bd..49b1078f63 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRATopicPublisher.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicPublisher.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.JMSException; import javax.jms.Message; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRATopicSubscriber.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicSubscriber.java similarity index 98% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRATopicSubscriber.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicSubscriber.java index d0f7d093d8..537da8955f 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRATopicSubscriber.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRATopicSubscriber.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.JMSException; import javax.jms.Topic; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAXAJMSContext.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAXAJMSContext.java similarity index 85% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAXAJMSContext.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAXAJMSContext.java index c14594ab9d..75a806db62 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAXAJMSContext.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAXAJMSContext.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; -import org.apache.activemq.jms.client.ActiveMQConnectionForContext; -import org.apache.activemq.jms.client.ThreadAwareContext; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionForContext; +import org.apache.activemq.artemis.jms.client.ThreadAwareContext; import javax.jms.XAJMSContext; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAXAResource.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAXAResource.java similarity index 96% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAXAResource.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAXAResource.java index 89f314e18b..5668b6f66f 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRAXAResource.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAXAResource.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.client.impl.ClientSessionInternal; -import org.apache.activemq.core.client.impl.ActiveMQXAResource; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; +import org.apache.activemq.artemis.core.client.impl.ActiveMQXAResource; /** * ActiveMQXAResource. diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRaUtils.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRaUtils.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRaUtils.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRaUtils.java index a562a20d3e..843fec53ec 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRaUtils.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRaUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.naming.Context; import java.lang.reflect.Method; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java similarity index 98% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java index 411e3e1845..f8c5d978e6 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import javax.jms.Session; import javax.resource.ResourceException; @@ -38,24 +38,24 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.BroadcastEndpointFactory; -import org.apache.activemq.api.core.ChannelBroadcastEndpointFactory; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.JGroupsFileBroadcastEndpointFactory; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.UDPBroadcastEndpointFactory; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.jms.ActiveMQJMSClient; -import org.apache.activemq.api.jms.JMSFactoryType; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.ra.inflow.ActiveMQActivation; -import org.apache.activemq.ra.inflow.ActiveMQActivationSpec; -import org.apache.activemq.ra.recovery.RecoveryManager; -import org.apache.activemq.service.extensions.ServiceUtils; -import org.apache.activemq.utils.SensitiveDataCodec; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.ChannelBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.JGroupsFileBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.ra.inflow.ActiveMQActivation; +import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec; +import org.apache.activemq.artemis.ra.recovery.RecoveryManager; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.service.extensions.ServiceUtils; +import org.apache.activemq.artemis.utils.SensitiveDataCodec; import org.jgroups.JChannel; /** diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ConnectionFactoryProperties.java similarity index 99% rename from activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ConnectionFactoryProperties.java index bab9ff97cd..d610256f8f 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ConnectionFactoryProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra; +package org.apache.activemq.artemis.ra; import java.util.List; import java.util.Map; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/ActiveMQActivation.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java similarity index 94% rename from activemq-ra/src/main/java/org/apache/activemq/ra/inflow/ActiveMQActivation.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java index 80811c04ba..4711b0f1f4 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/ActiveMQActivation.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra.inflow; +package org.apache.activemq.artemis.ra.inflow; import javax.jms.Destination; import javax.jms.Message; @@ -33,25 +33,25 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; -import org.apache.activemq.api.core.ActiveMQNotConnectedException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.jms.ActiveMQJMSClient; -import org.apache.activemq.core.client.impl.ClientSessionInternal; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.ra.ActiveMQRABundle; -import org.apache.activemq.ra.ActiveMQRAConnectionFactory; -import org.apache.activemq.ra.ActiveMQRALogger; -import org.apache.activemq.ra.ActiveMQRaUtils; -import org.apache.activemq.ra.ActiveMQResourceAdapter; -import org.apache.activemq.service.extensions.xa.recovery.XARecoveryConfig; -import org.apache.activemq.utils.FutureLatch; -import org.apache.activemq.utils.SensitiveDataCodec; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException; +import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; +import org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.ra.ActiveMQRABundle; +import org.apache.activemq.artemis.ra.ActiveMQRALogger; +import org.apache.activemq.artemis.ra.ActiveMQRaUtils; +import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter; +import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConfig; +import org.apache.activemq.artemis.utils.FutureLatch; +import org.apache.activemq.artemis.utils.SensitiveDataCodec; /** * The activation. diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/ActiveMQActivationSpec.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java similarity index 98% rename from activemq-ra/src/main/java/org/apache/activemq/ra/inflow/ActiveMQActivationSpec.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java index 3261499acc..91254ac375 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/ActiveMQActivationSpec.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra.inflow; +package org.apache.activemq.artemis.ra.inflow; import javax.jms.Queue; import javax.jms.Session; @@ -31,10 +31,10 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.List; -import org.apache.activemq.ra.ConnectionFactoryProperties; -import org.apache.activemq.ra.ActiveMQRALogger; -import org.apache.activemq.ra.ActiveMQRaUtils; -import org.apache.activemq.ra.ActiveMQResourceAdapter; +import org.apache.activemq.artemis.ra.ConnectionFactoryProperties; +import org.apache.activemq.artemis.ra.ActiveMQRALogger; +import org.apache.activemq.artemis.ra.ActiveMQRaUtils; +import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter; /** * The activation spec diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/ActiveMQMessageHandler.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQMessageHandler.java similarity index 92% rename from activemq-ra/src/main/java/org/apache/activemq/ra/inflow/ActiveMQMessageHandler.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQMessageHandler.java index 0a217189f2..693df60b73 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/ActiveMQMessageHandler.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQMessageHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra.inflow; +package org.apache.activemq.artemis.ra.inflow; import javax.jms.MessageListener; import javax.resource.ResourceException; @@ -27,23 +27,23 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession.QueueQuery; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.MessageHandler; -import org.apache.activemq.core.client.impl.ClientConsumerInternal; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.client.impl.ClientSessionInternal; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.jms.client.ActiveMQMessage; -import org.apache.activemq.ra.ActiveMQRALogger; -import org.apache.activemq.ra.ActiveMQResourceAdapter; -import org.apache.activemq.service.extensions.ServiceUtils; -import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapper; -import org.apache.activemq.utils.FutureLatch; -import org.apache.activemq.utils.VersionLoader; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession.QueueQuery; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.MessageHandler; +import org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; +import org.apache.activemq.artemis.ra.ActiveMQRALogger; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.jms.client.ActiveMQMessage; +import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter; +import org.apache.activemq.artemis.service.extensions.ServiceUtils; +import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapper; +import org.apache.activemq.artemis.utils.FutureLatch; +import org.apache.activemq.artemis.utils.VersionLoader; /** * The message handler diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/package.html b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html similarity index 100% rename from activemq-ra/src/main/java/org/apache/activemq/ra/package.html rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/recovery/RecoveryManager.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/recovery/RecoveryManager.java similarity index 87% rename from activemq-ra/src/main/java/org/apache/activemq/ra/recovery/RecoveryManager.java rename to artemis-ra/src/main/java/org/apache/activemq/artemis/ra/recovery/RecoveryManager.java index e423c1f016..f429d6d8c8 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/recovery/RecoveryManager.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/recovery/RecoveryManager.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.ra.recovery; +package org.apache.activemq.artemis.ra.recovery; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ServiceLoader; import java.util.Set; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.ra.ActiveMQRALogger; -import org.apache.activemq.service.extensions.xa.recovery.ActiveMQRegistry; -import org.apache.activemq.service.extensions.xa.recovery.ActiveMQRegistryImpl; -import org.apache.activemq.service.extensions.xa.recovery.XARecoveryConfig; -import org.apache.activemq.utils.ClassloadingUtil; -import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.ra.ActiveMQRALogger; +import org.apache.activemq.artemis.service.extensions.xa.recovery.ActiveMQRegistry; +import org.apache.activemq.artemis.service.extensions.xa.recovery.ActiveMQRegistryImpl; +import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConfig; +import org.apache.activemq.artemis.utils.ClassloadingUtil; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; public final class RecoveryManager { diff --git a/activemq-rest/pom.xml b/artemis-rest/pom.xml similarity index 94% rename from activemq-rest/pom.xml rename to artemis-rest/pom.xml index a97c298b6c..b294eb4ea8 100644 --- a/activemq-rest/pom.xml +++ b/artemis-rest/pom.xml @@ -18,13 +18,13 @@ 4.0.0 org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT ActiveMQ Artemis REST Interface Implementation org.apache.activemq.rest - activemq-rest + artemis-rest jar @@ -82,12 +82,12 @@ org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/ActiveMQ.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java similarity index 97% rename from activemq-rest/src/main/java/org/apache/activemq/rest/ActiveMQ.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java index 024ca59748..514079f574 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/ActiveMQ.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest; +package org.apache.activemq.artemis.rest; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.MessageBodyReader; @@ -26,8 +26,8 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.lang.reflect.Type; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.rest.util.HttpMessageHelper; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.rest.util.HttpMessageHelper; import org.jboss.resteasy.core.Headers; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.jboss.resteasy.util.GenericType; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/ActiveMQRestBundle.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestBundle.java similarity index 96% rename from activemq-rest/src/main/java/org/apache/activemq/rest/ActiveMQRestBundle.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestBundle.java index 85becc7d04..711df15cd8 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/ActiveMQRestBundle.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestBundle.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest; +package org.apache.activemq.artemis.rest; import org.jboss.logging.annotations.MessageBundle; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/ActiveMQRestLogger.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java similarity index 95% rename from activemq-rest/src/main/java/org/apache/activemq/rest/ActiveMQRestLogger.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java index d079086f48..09bd521c87 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/ActiveMQRestLogger.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest; +package org.apache.activemq.artemis.rest; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.rest.queue.push.xml.XmlLink; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/HttpHeaderProperty.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/HttpHeaderProperty.java similarity index 97% rename from activemq-rest/src/main/java/org/apache/activemq/rest/HttpHeaderProperty.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/HttpHeaderProperty.java index 2ea4cb8356..0f6093dde0 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/HttpHeaderProperty.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/HttpHeaderProperty.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest; +package org.apache.activemq.artemis.rest; public class HttpHeaderProperty { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/Jms.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/Jms.java similarity index 98% rename from activemq-rest/src/main/java/org/apache/activemq/rest/Jms.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/Jms.java index 356052cd1a..4ee119fbcd 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/Jms.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/Jms.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest; +package org.apache.activemq.artemis.rest; -import org.apache.activemq.rest.util.HttpMessageHelper; +import org.apache.activemq.artemis.rest.util.HttpMessageHelper; import org.jboss.resteasy.core.Headers; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.jboss.resteasy.util.GenericType; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceConfiguration.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceConfiguration.java similarity index 99% rename from activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceConfiguration.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceConfiguration.java index eeb6e444d3..8b84cbd91b 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceConfiguration.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest; +package org.apache.activemq.artemis.rest; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceManager.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceManager.java similarity index 87% rename from activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceManager.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceManager.java index a60d6638e5..39f43c96b1 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceManager.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest; +package org.apache.activemq.artemis.rest; import java.io.InputStreamReader; import java.io.Reader; @@ -26,21 +26,21 @@ import java.util.concurrent.Executors; import javax.xml.bind.JAXBContext; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.client.impl.ServerLocatorImpl; -import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq.core.remoting.impl.invm.TransportConstants; -import org.apache.activemq.rest.queue.DestinationSettings; -import org.apache.activemq.rest.queue.QueueServiceManager; -import org.apache.activemq.rest.topic.TopicServiceManager; -import org.apache.activemq.rest.util.CustomHeaderLinkStrategy; -import org.apache.activemq.rest.util.LinkHeaderLinkStrategy; -import org.apache.activemq.rest.util.LinkStrategy; -import org.apache.activemq.rest.util.TimeoutTask; -import org.apache.activemq.spi.core.naming.BindingRegistry; -import org.apache.activemq.utils.XMLUtil; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq.artemis.rest.queue.DestinationSettings; +import org.apache.activemq.artemis.rest.queue.QueueServiceManager; +import org.apache.activemq.artemis.rest.topic.TopicServiceManager; +import org.apache.activemq.artemis.rest.util.CustomHeaderLinkStrategy; +import org.apache.activemq.artemis.rest.util.LinkHeaderLinkStrategy; +import org.apache.activemq.artemis.rest.util.LinkStrategy; +import org.apache.activemq.artemis.rest.util.TimeoutTask; +import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.utils.XMLUtil; public class MessageServiceManager { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/UnknownMediaType.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnknownMediaType.java similarity index 95% rename from activemq-rest/src/main/java/org/apache/activemq/rest/UnknownMediaType.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnknownMediaType.java index 9e74c6c71a..01447d9fec 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/UnknownMediaType.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnknownMediaType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest; +package org.apache.activemq.artemis.rest; public class UnknownMediaType extends RuntimeException { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/UnmarshalException.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnmarshalException.java similarity index 96% rename from activemq-rest/src/main/java/org/apache/activemq/rest/UnmarshalException.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnmarshalException.java index 95f2ab6fe0..769c939872 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/UnmarshalException.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnmarshalException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest; +package org.apache.activemq.artemis.rest; public class UnmarshalException extends RuntimeException { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/ActiveMQBootstrapListener.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ActiveMQBootstrapListener.java similarity index 93% rename from activemq-rest/src/main/java/org/apache/activemq/rest/integration/ActiveMQBootstrapListener.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ActiveMQBootstrapListener.java index a9bbedb38e..bddb989b5e 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/ActiveMQBootstrapListener.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ActiveMQBootstrapListener.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.integration; +package org.apache.activemq.artemis.rest.integration; -import org.apache.activemq.jms.server.embedded.EmbeddedJMS; +import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestActiveMQ.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQ.java similarity index 92% rename from activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestActiveMQ.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQ.java index b59a6a4755..e57470d31c 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestActiveMQ.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQ.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.integration; +package org.apache.activemq.artemis.rest.integration; -import org.apache.activemq.core.server.embedded.EmbeddedActiveMQ; +import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; import org.jboss.resteasy.plugins.server.tjws.TJWSEmbeddedJaxrsServer; -import org.apache.activemq.rest.MessageServiceManager; +import org.apache.activemq.artemis.rest.MessageServiceManager; import org.jboss.resteasy.test.TestPortProvider; public class EmbeddedRestActiveMQ diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestActiveMQJMS.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMS.java similarity index 86% rename from activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestActiveMQJMS.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMS.java index b73b943629..cecb053bd9 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestActiveMQJMS.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMS.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.integration; +package org.apache.activemq.artemis.rest.integration; -import org.apache.activemq.jms.server.embedded.EmbeddedJMS; -import org.apache.activemq.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS; +import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; public class EmbeddedRestActiveMQJMS extends EmbeddedRestActiveMQ { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/RestMessagingBootstrapListener.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/RestMessagingBootstrapListener.java similarity index 94% rename from activemq-rest/src/main/java/org/apache/activemq/rest/integration/RestMessagingBootstrapListener.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/RestMessagingBootstrapListener.java index 22a311df7b..63c22e8a0f 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/RestMessagingBootstrapListener.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/RestMessagingBootstrapListener.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.integration; +package org.apache.activemq.artemis.rest.integration; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import org.apache.activemq.rest.MessageServiceManager; +import org.apache.activemq.artemis.rest.MessageServiceManager; import org.jboss.resteasy.spi.Registry; public class RestMessagingBootstrapListener implements ServletContextListener diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/ServletContextBindingRegistry.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ServletContextBindingRegistry.java similarity index 92% rename from activemq-rest/src/main/java/org/apache/activemq/rest/integration/ServletContextBindingRegistry.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ServletContextBindingRegistry.java index 2c9a1358c1..988f206f44 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/ServletContextBindingRegistry.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ServletContextBindingRegistry.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.integration; +package org.apache.activemq.artemis.rest.integration; -import org.apache.activemq.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; import javax.servlet.ServletContext; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/AcknowledgedQueueConsumer.java similarity index 93% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/AcknowledgedQueueConsumer.java index b9af2499c8..4ad260f97b 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/AcknowledgedQueueConsumer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; import javax.ws.rs.DefaultValue; import javax.ws.rs.FormParam; @@ -29,14 +29,14 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import java.net.URI; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.util.Constants; -import org.apache.activemq.rest.util.LinkStrategy; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.rest.util.Constants; +import org.apache.activemq.artemis.rest.util.LinkStrategy; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; public class AcknowledgedQueueConsumer extends QueueConsumer { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/Acknowledgement.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/Acknowledgement.java similarity index 93% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/Acknowledgement.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/Acknowledgement.java index 991bc363fd..ae36beb7bb 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/Acknowledgement.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/Acknowledgement.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; -import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientMessage; public class Acknowledgement { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedHttpMessage.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedHttpMessage.java similarity index 92% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedHttpMessage.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedHttpMessage.java index 84c054080a..db6042dd06 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedHttpMessage.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedHttpMessage.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; -import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientMessage; import javax.ws.rs.core.Response; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedMessage.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedMessage.java similarity index 88% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedMessage.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedMessage.java index cd0d3414b6..185fde470b 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedMessage.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedMessage.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.HttpHeaderProperty; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.rest.HttpHeaderProperty; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; import javax.ws.rs.core.Response; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedObjectMessage.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedObjectMessage.java similarity index 94% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedObjectMessage.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedObjectMessage.java index f41b55744c..6e4c4a2892 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedObjectMessage.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedObjectMessage.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; -import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientMessage; import javax.ws.rs.core.Response; import java.io.ByteArrayInputStream; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumersResource.java similarity index 97% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumersResource.java index ec11ef7054..0e9c703f56 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumersResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; import javax.ws.rs.DELETE; import javax.ws.rs.DefaultValue; @@ -32,10 +32,10 @@ import javax.ws.rs.core.UriInfo; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.util.TimeoutTask; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.util.TimeoutTask; public class ConsumersResource implements TimeoutTask.Callback { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationResource.java similarity index 96% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationResource.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationResource.java index 51d2af5664..f9e1f11e98 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationResource.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; public class DestinationResource { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationServiceManager.java similarity index 88% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationServiceManager.java index e6e87029be..99cda663f2 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationServiceManager.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq.rest.util.LinkStrategy; -import org.apache.activemq.rest.util.TimeoutTask; -import org.apache.activemq.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.artemis.rest.util.LinkStrategy; +import org.apache.activemq.artemis.rest.util.TimeoutTask; +import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; public abstract class DestinationServiceManager { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationSettings.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationSettings.java similarity index 97% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationSettings.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationSettings.java index c492669134..ad28341fc9 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationSettings.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationSettings.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; public class DestinationSettings { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessage.java similarity index 93% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessage.java index ba0fbe0bf4..278f07bd34 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; import javax.ws.rs.POST; import javax.ws.rs.PUT; @@ -32,16 +32,16 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.util.HttpMessageHelper; -import org.apache.activemq.utils.UUID; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.rest.util.HttpMessageHelper; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.utils.UUID; +import org.apache.activemq.artemis.utils.UUIDGenerator; public class PostMessage { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageDupsOk.java similarity index 91% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageDupsOk.java index 7dc7570661..ee3e3f317b 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageDupsOk.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; import javax.ws.rs.POST; import javax.ws.rs.QueryParam; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java similarity index 93% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java index e6b96fa536..afbe4f32db 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; -import org.apache.activemq.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; import javax.ws.rs.POST; import javax.ws.rs.core.Context; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueConsumer.java similarity index 93% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueConsumer.java index bdf9848505..9527d89dba 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueConsumer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; import javax.ws.rs.DefaultValue; import javax.ws.rs.HeaderParam; @@ -28,15 +28,15 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import java.net.URI; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.jms.client.SelectorTranslator; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.util.Constants; -import org.apache.activemq.rest.util.LinkStrategy; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.util.Constants; +import org.apache.activemq.artemis.rest.util.LinkStrategy; +import org.apache.activemq.artemis.jms.client.SelectorTranslator; /** * Auto-acknowleged consumer diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDeployment.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDeployment.java similarity index 96% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDeployment.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDeployment.java index ef3f4e04ee..e5af6f7422 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDeployment.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDeployment.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; public class QueueDeployment extends DestinationSettings { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDestinationsResource.java similarity index 89% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDestinationsResource.java index 6fb1fa5b5d..8d037a9444 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDestinationsResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; import javax.ws.rs.Consumes; import javax.ws.rs.POST; @@ -29,17 +29,17 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.jms.client.ActiveMQQueue; -import org.apache.activemq.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.queue.push.PushConsumerResource; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; -import org.apache.activemq.rest.util.Constants; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.queue.push.PushConsumerResource; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.rest.util.Constants; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.jms.client.ActiveMQQueue; +import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration; import org.w3c.dom.Document; @Path(Constants.PATH_FOR_QUEUES) diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueResource.java similarity index 95% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueResource.java index 4cc5025310..9abcc92215 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.DELETE; @@ -27,10 +27,10 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.queue.push.PushConsumerResource; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.rest.queue.push.PushConsumerResource; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; public class QueueResource extends DestinationResource { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueServiceManager.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueServiceManager.java similarity index 91% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueServiceManager.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueServiceManager.java index 25a28a9235..acdd4ccefe 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueServiceManager.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueServiceManager.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue; +package org.apache.activemq.artemis.rest.queue; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.rest.queue.push.FilePushStore; -import org.apache.activemq.rest.queue.push.PushStore; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.rest.queue.push.PushStore; +import org.apache.activemq.artemis.rest.queue.push.FilePushStore; public class QueueServiceManager extends DestinationServiceManager { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/ActiveMQPushStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java similarity index 93% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/ActiveMQPushStrategy.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java index c8d79e1ba7..9506e9e49f 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/ActiveMQPushStrategy.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push; +package org.apache.activemq.artemis.rest.queue.push; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.rest.queue.push.xml.XmlHttpHeader; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.rest.queue.push.xml.XmlHttpHeader; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.specimpl.ResteasyUriBuilder; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java similarity index 93% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java index f5aeb003dd..5c087990ef 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push; +package org.apache.activemq.artemis.rest.queue.push; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; -import org.apache.activemq.rest.topic.PushTopicRegistration; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.rest.topic.PushTopicRegistration; public class FilePushStore implements PushStore { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumer.java similarity index 88% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumer.java index c863928404..72e349fce2 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumer.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push; +package org.apache.activemq.artemis.rest.queue.push; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.jms.client.SelectorTranslator; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.jms.client.SelectorTranslator; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; import java.util.ArrayList; import java.util.List; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerMessageHandler.java similarity index 86% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerMessageHandler.java index 366804c010..a6960dc337 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerMessageHandler.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push; +package org.apache.activemq.artemis.rest.queue.push; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.MessageHandler; -import org.apache.activemq.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.MessageHandler; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; public class PushConsumerMessageHandler implements MessageHandler { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerResource.java similarity index 95% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerResource.java index 8973185175..88e7ffc68e 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push; +package org.apache.activemq.artemis.rest.queue.push; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -32,9 +32,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; public class PushConsumerResource { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStore.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStore.java similarity index 89% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStore.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStore.java index ecf7c5ef73..6f3e98978d 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStore.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStore.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push; +package org.apache.activemq.artemis.rest.queue.push; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; import java.util.List; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStrategy.java similarity index 87% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStrategy.java index 1bbaec9e75..8843483618 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStrategy.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push; +package org.apache.activemq.artemis.rest.queue.push; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; public interface PushStrategy { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriStrategy.java similarity index 95% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriStrategy.java index 7dd1db381c..cd362a20af 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriStrategy.java @@ -14,11 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push; +package org.apache.activemq.artemis.rest.queue.push; import javax.ws.rs.core.UriBuilder; import java.io.IOException; +import org.apache.activemq.artemis.rest.queue.push.xml.BasicAuth; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.rest.util.HttpMessageHelper; import org.apache.http.HttpException; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; @@ -37,12 +40,9 @@ import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.ExecutionContext; import org.apache.http.protocol.HttpContext; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.queue.push.xml.BasicAuth; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; -import org.apache.activemq.rest.queue.push.xml.XmlHttpHeader; -import org.apache.activemq.rest.util.HttpMessageHelper; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.queue.push.xml.XmlHttpHeader; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.client.core.executors.ApacheHttpClient4Executor; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriTemplateStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriTemplateStrategy.java similarity index 90% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriTemplateStrategy.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriTemplateStrategy.java index c2224e14e8..7de2e22293 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriTemplateStrategy.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriTemplateStrategy.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push; +package org.apache.activemq.artemis.rest.queue.push; -import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientMessage; public class UriTemplateStrategy extends UriStrategy { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/Authentication.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/Authentication.java similarity index 96% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/Authentication.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/Authentication.java index c298b3cf0b..8c6abd0ec2 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/Authentication.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/Authentication.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push.xml; +package org.apache.activemq.artemis.rest.queue.push.xml; import java.io.Serializable; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/AuthenticationType.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/AuthenticationType.java similarity index 94% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/AuthenticationType.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/AuthenticationType.java index 6eb3077955..6e5979829a 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/AuthenticationType.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/AuthenticationType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push.xml; +package org.apache.activemq.artemis.rest.queue.push.xml; import javax.xml.bind.annotation.XmlSeeAlso; import java.io.Serializable; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/BasicAuth.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/BasicAuth.java similarity index 96% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/BasicAuth.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/BasicAuth.java index 336a334df0..d764352d2a 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/BasicAuth.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/BasicAuth.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push.xml; +package org.apache.activemq.artemis.rest.queue.push.xml; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/DigestAuth.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/DigestAuth.java similarity index 94% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/DigestAuth.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/DigestAuth.java index f2c8a420b4..89640a6d83 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/DigestAuth.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/DigestAuth.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push.xml; +package org.apache.activemq.artemis.rest.queue.push.xml; import javax.xml.bind.annotation.XmlRootElement; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/PushRegistration.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/PushRegistration.java similarity index 98% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/PushRegistration.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/PushRegistration.java index 43fa92935a..860ca4acdb 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/PushRegistration.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/PushRegistration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push.xml; +package org.apache.activemq.artemis.rest.queue.push.xml; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlHttpHeader.java similarity index 96% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlHttpHeader.java index a1a64451f7..c58ec1aed1 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlHttpHeader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push.xml; +package org.apache.activemq.artemis.rest.queue.push.xml; import java.io.Serializable; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlLink.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlLink.java similarity index 97% rename from activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlLink.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlLink.java index f97f249686..c0cf1ffd8f 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlLink.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlLink.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.queue.push.xml; +package org.apache.activemq.artemis.rest.queue.push.xml; import java.io.Serializable; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/AcknowledgedSubscriptionResource.java similarity index 84% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/AcknowledgedSubscriptionResource.java index 3d409bb2c3..4ee38464cc 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/AcknowledgedSubscriptionResource.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.queue.AcknowledgedQueueConsumer; -import org.apache.activemq.rest.queue.DestinationServiceManager; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.rest.queue.AcknowledgedQueueConsumer; +import org.apache.activemq.artemis.rest.queue.DestinationServiceManager; public class AcknowledgedSubscriptionResource extends AcknowledgedQueueConsumer implements Subscription { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/FileTopicPushStore.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/FileTopicPushStore.java similarity index 88% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/FileTopicPushStore.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/FileTopicPushStore.java index 0aab4315b5..ef7b884ce0 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/FileTopicPushStore.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/FileTopicPushStore.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.rest.queue.push.FilePushStore; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.rest.queue.push.FilePushStore; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; public class FileTopicPushStore extends FilePushStore implements TopicPushStore { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscription.java similarity index 77% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscription.java index c469d23dec..c878d74545 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscription.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.queue.push.PushConsumer; -import org.apache.activemq.rest.queue.push.PushStore; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.rest.queue.push.PushStore; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.queue.push.PushConsumer; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; public class PushSubscription extends PushConsumer { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscriptionsResource.java similarity index 94% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscriptionsResource.java index f43577be91..ed95dea738 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscriptionsResource.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.queue.push.PushConsumer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.rest.queue.push.PushConsumer; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; import javax.ws.rs.DELETE; import javax.ws.rs.GET; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushTopicRegistration.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushTopicRegistration.java similarity index 92% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushTopicRegistration.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushTopicRegistration.java index d2d7ff059a..ed01fcb1a4 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushTopicRegistration.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushTopicRegistration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; @XmlRootElement(name = "push-topic-registration") @XmlAccessorType(XmlAccessType.PROPERTY) diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/Subscription.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/Subscription.java similarity index 95% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/Subscription.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/Subscription.java index 8688bc3f04..c2a37f8299 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/Subscription.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/Subscription.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; public interface Subscription { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionResource.java similarity index 84% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionResource.java index db4ec701b1..ef77b4f85b 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionResource.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.queue.DestinationServiceManager; -import org.apache.activemq.rest.queue.QueueConsumer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.rest.queue.DestinationServiceManager; +import org.apache.activemq.artemis.rest.queue.QueueConsumer; public class SubscriptionResource extends QueueConsumer implements Subscription { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionsResource.java similarity index 96% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionsResource.java index 7f03a2ca1f..7b3738cfe2 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionsResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; import javax.ws.rs.DELETE; import javax.ws.rs.DefaultValue; @@ -32,16 +32,16 @@ import javax.ws.rs.core.UriInfo; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.queue.AcknowledgedQueueConsumer; -import org.apache.activemq.rest.queue.Acknowledgement; -import org.apache.activemq.rest.queue.DestinationServiceManager; -import org.apache.activemq.rest.queue.QueueConsumer; -import org.apache.activemq.rest.util.TimeoutTask; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.rest.queue.Acknowledgement; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.queue.AcknowledgedQueueConsumer; +import org.apache.activemq.artemis.rest.queue.DestinationServiceManager; +import org.apache.activemq.artemis.rest.queue.QueueConsumer; +import org.apache.activemq.artemis.rest.util.TimeoutTask; public class SubscriptionsResource implements TimeoutTask.Callback { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDeployment.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDeployment.java similarity index 91% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDeployment.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDeployment.java index 0224a3c896..c95bac56e7 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDeployment.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDeployment.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; -import org.apache.activemq.rest.queue.DestinationSettings; +import org.apache.activemq.artemis.rest.queue.DestinationSettings; public class TopicDeployment extends DestinationSettings { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDestinationsResource.java similarity index 88% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDestinationsResource.java index 1539610e8a..8f2db01920 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDestinationsResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; import javax.ws.rs.Consumes; import javax.ws.rs.POST; @@ -29,18 +29,18 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.jms.client.ActiveMQTopic; -import org.apache.activemq.jms.server.config.TopicConfiguration; -import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.queue.DestinationSettings; -import org.apache.activemq.rest.queue.PostMessage; -import org.apache.activemq.rest.queue.PostMessageDupsOk; -import org.apache.activemq.rest.queue.PostMessageNoDups; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.rest.queue.DestinationSettings; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.jms.client.ActiveMQTopic; +import org.apache.activemq.artemis.jms.server.config.TopicConfiguration; +import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.queue.PostMessage; +import org.apache.activemq.artemis.rest.queue.PostMessageDupsOk; +import org.apache.activemq.artemis.rest.queue.PostMessageNoDups; import org.w3c.dom.Document; @Path("/topics") diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicPushStore.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicPushStore.java similarity index 89% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicPushStore.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicPushStore.java index 6752ab10cb..10d47806f5 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicPushStore.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicPushStore.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; -import org.apache.activemq.rest.queue.push.PushStore; +import org.apache.activemq.artemis.rest.queue.push.PushStore; import java.util.List; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicResource.java similarity index 94% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicResource.java index 3a1b61e622..bc872e728a 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -26,11 +26,11 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.queue.DestinationResource; -import org.apache.activemq.rest.queue.PostMessage; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.queue.DestinationResource; +import org.apache.activemq.artemis.rest.queue.PostMessage; public class TopicResource extends DestinationResource { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicServiceManager.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicServiceManager.java similarity index 92% rename from activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicServiceManager.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicServiceManager.java index bbf0a7fd8a..edcb64c2de 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicServiceManager.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicServiceManager.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.topic; +package org.apache.activemq.artemis.rest.topic; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.rest.queue.DestinationServiceManager; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.rest.queue.DestinationServiceManager; import java.util.ArrayList; import java.util.List; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/Constants.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/Constants.java similarity index 95% rename from activemq-rest/src/main/java/org/apache/activemq/rest/util/Constants.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/Constants.java index faff6973bf..c0e1974c87 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/Constants.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/Constants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.util; +package org.apache.activemq.artemis.rest.util; public interface Constants { diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/CustomHeaderLinkStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/CustomHeaderLinkStrategy.java similarity index 96% rename from activemq-rest/src/main/java/org/apache/activemq/rest/util/CustomHeaderLinkStrategy.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/CustomHeaderLinkStrategy.java index b005271cf7..df314760b4 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/CustomHeaderLinkStrategy.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/CustomHeaderLinkStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.util; +package org.apache.activemq.artemis.rest.util; import javax.ws.rs.core.Response; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/HttpMessageHelper.java similarity index 95% rename from activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/HttpMessageHelper.java index 128fbefa70..d75ef18f3b 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/HttpMessageHelper.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.util; +package org.apache.activemq.artemis.rest.util; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.rest.ActiveMQRestLogger; -import org.apache.activemq.rest.HttpHeaderProperty; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.rest.HttpHeaderProperty; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; import org.jboss.resteasy.client.ClientRequest; import javax.ws.rs.core.HttpHeaders; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkHeaderLinkStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/LinkHeaderLinkStrategy.java similarity index 97% rename from activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkHeaderLinkStrategy.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/LinkHeaderLinkStrategy.java index 87f6945210..b50242eb13 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkHeaderLinkStrategy.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/LinkHeaderLinkStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.util; +package org.apache.activemq.artemis.rest.util; import org.jboss.resteasy.spi.Link; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/LinkStrategy.java similarity index 95% rename from activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkStrategy.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/LinkStrategy.java index 8a4dab4e2d..8cf3ec799e 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkStrategy.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/LinkStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.util; +package org.apache.activemq.artemis.rest.util; import javax.ws.rs.core.Response; diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/TimeoutTask.java similarity index 98% rename from activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java rename to artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/TimeoutTask.java index c423610365..257b63dd07 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/TimeoutTask.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.util; +package org.apache.activemq.artemis.rest.util; import java.util.ArrayList; import java.util.HashMap; @@ -23,7 +23,7 @@ import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.rest.ActiveMQRestLogger; +import org.apache.activemq.artemis.rest.ActiveMQRestLogger; public class TimeoutTask implements Runnable { diff --git a/activemq-rest/src/main/resources/schema/hornetq-rest.xsd b/artemis-rest/src/main/resources/schema/activemq-rest.xsd similarity index 100% rename from activemq-rest/src/main/resources/schema/hornetq-rest.xsd rename to artemis-rest/src/main/resources/schema/activemq-rest.xsd diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckQueueTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckQueueTest.java similarity index 70% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckQueueTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckQueueTest.java index b5d916c2fa..2b45bfbb57 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckQueueTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckQueueTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.queue.QueueDeployment; -import org.apache.activemq.rest.util.Constants; +import org.apache.activemq.artemis.rest.queue.QueueDeployment; +import org.apache.activemq.artemis.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -42,19 +42,19 @@ public class AutoAckQueueTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); - System.out.println("create-with-id: " + MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create-with-id")); + System.out.println("create-with-id: " + getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create-with-id")); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); - System.out.println("create-next: " + MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "create-next")); + System.out.println("create-next: " + getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "create-next")); res = sender.request().body("text/plain", Integer.toString(2)).post(); res.releaseConnection(); @@ -64,9 +64,9 @@ public class AutoAckQueueTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); System.out.println("consumeNext: " + consumeNext); System.out.println(consumeNext); @@ -74,9 +74,9 @@ public class AutoAckQueueTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("2", res.getEntity(String.class)); res.releaseConnection(); - session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); + getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); System.out.println("consumeNext: " + consumeNext); res = session.request().delete(); diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckTopicTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckTopicTest.java similarity index 83% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckTopicTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckTopicTest.java index abfe085674..04805aff69 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckTopicTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckTopicTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.topic.TopicDeployment; +import org.apache.activemq.artemis.rest.topic.TopicDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -41,8 +41,8 @@ public class AutoAckTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); - Link subscriptions = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); + Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); + Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); ClientResponse res = subscriptions.request().post(); @@ -50,7 +50,7 @@ public class AutoAckTopicTest extends MessageTestBase Assert.assertEquals(201, res.getStatus()); Link sub1 = res.getLocationLink(); Assert.assertNotNull(sub1); - Link consumeNext1 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + Link consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext1); System.out.println("consumeNext1: " + consumeNext1); @@ -60,7 +60,7 @@ public class AutoAckTopicTest extends MessageTestBase Assert.assertEquals(201, res.getStatus()); Link sub2 = res.getLocationLink(); Assert.assertNotNull(sub2); - Link consumeNext2 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + Link consumeNext2 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext2); System.out.println("consumeNext2: " + consumeNext2); @@ -76,25 +76,25 @@ public class AutoAckTopicTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); - consumeNext1 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); res = consumeNext1.request().post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("2", res.getEntity(String.class)); res.releaseConnection(); - consumeNext1 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); res = consumeNext2.request().post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); - consumeNext2 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + consumeNext2 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); res = consumeNext2.request().post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("2", res.getEntity(String.class)); res.releaseConnection(); - consumeNext2 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + consumeNext2 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertEquals(204, sub1.request().delete().getStatus()); Assert.assertEquals(204, sub2.request().delete().getStatus()); } @@ -117,8 +117,8 @@ public class AutoAckTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); - Link subscriptions = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); + Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); + Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); // Create the pull-subscription itself. ClientResponse res = subscriptions.request().post(); @@ -126,7 +126,7 @@ public class AutoAckTopicTest extends MessageTestBase Assert.assertEquals(201, res.getStatus()); Link sub1 = res.getLocationLink(); Assert.assertNotNull(sub1); - Link consumeNext1 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + Link consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext1); // Pull on the topic for 8s (long enoguh to guarantee the rest of the test diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/ClientAckQueueTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java similarity index 71% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/ClientAckQueueTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java index 44fe46fe40..f6a93759f2 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/ClientAckQueueTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.queue.QueueDeployment; -import org.apache.activemq.rest.util.Constants; -import org.apache.activemq.rest.util.CustomHeaderLinkStrategy; -import org.apache.activemq.rest.util.LinkHeaderLinkStrategy; +import org.apache.activemq.artemis.rest.util.Constants; +import org.apache.activemq.artemis.rest.util.LinkHeaderLinkStrategy; +import org.apache.activemq.artemis.rest.queue.QueueDeployment; +import org.apache.activemq.artemis.rest.util.CustomHeaderLinkStrategy; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -61,12 +61,12 @@ public class ClientAckQueueTest extends MessageTestBase ClientResponse response = Util.head(request); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, false); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("poller: " + consumeNext); { @@ -78,12 +78,12 @@ public class ClientAckQueueTest extends MessageTestBase res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); + Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); // test timeout @@ -93,19 +93,19 @@ public class ClientAckQueueTest extends MessageTestBase ackRes.releaseConnection(); Assert.assertEquals(412, ackRes.getStatus()); System.out.println("**** Successfully failed ack"); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); } { ClientResponse res = consumeNext.request().header(Constants.WAIT_HEADER, "2").post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); + Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); @@ -140,12 +140,12 @@ public class ClientAckQueueTest extends MessageTestBase ClientRequest request = new ClientRequest(generateURL(Util.getUrlPath(queueName))); ClientResponse response = Util.head(request); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull-consumers: " + consumers); response = Util.setAutoAck(consumers, false); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("acknowledge-next: " + consumeNext); String data = Integer.toString(start); @@ -159,17 +159,17 @@ public class ClientAckQueueTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals(Integer.toString(start++), res.getEntity()); res.releaseConnection(); - Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); + Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); System.out.println("sending next..."); String data2 = Integer.toString(start); @@ -183,15 +183,15 @@ public class ClientAckQueueTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals(Integer.toString(start++), res.getEntity()); res.releaseConnection(); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); - session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); res = consumeNext.request().post(String.class); res.releaseConnection(); @@ -220,18 +220,18 @@ public class ClientAckQueueTest extends MessageTestBase ClientRequest request = new ClientRequest(generateURL(Util.getUrlPath(queueName))); ClientResponse response = Util.head(request); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, false); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("poller: " + consumeNext); ClientResponse res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(503, res.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println(consumeNext); res = sender.request().body("text/plain", Integer.toString(start)).post(); res.releaseConnection(); @@ -240,7 +240,7 @@ public class ClientAckQueueTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals(Integer.toString(start++), res.getEntity()); res.releaseConnection(); - Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); + Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); @@ -260,7 +260,7 @@ public class ClientAckQueueTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals(Integer.toString(start++), res.getEntity()); res.releaseConnection(); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); @@ -270,12 +270,12 @@ public class ClientAckQueueTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals(Integer.toString(start++), res.getEntity()); res.releaseConnection(); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "consumer"); res = consumeNext.request().post(); res.releaseConnection(); @@ -305,12 +305,12 @@ public class ClientAckQueueTest extends MessageTestBase ClientRequest request = new ClientRequest(generateURL(Util.getUrlPath(queueName))); ClientResponse response = Util.head(request); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, false); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -320,17 +320,17 @@ public class ClientAckQueueTest extends MessageTestBase res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); + Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); System.out.println("before close session consumeNext: " + consumeNext); // test reconnect with a disconnected acknowledge-next @@ -344,14 +344,14 @@ public class ClientAckQueueTest extends MessageTestBase res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); - session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "consumer"); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); + session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "consumer"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); System.out.println("session: " + session); // test reconnect with disconnected acknowledge @@ -362,7 +362,7 @@ public class ClientAckQueueTest extends MessageTestBase res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); @@ -371,17 +371,17 @@ public class ClientAckQueueTest extends MessageTestBase ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(412, ackRes.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); - session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "consumer"); + session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "consumer"); Assert.assertEquals(204, session.request().delete().getStatus()); } diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/ClientAckTopicTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java similarity index 72% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/ClientAckTopicTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java index e5e7a7455c..8fe658d400 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/ClientAckTopicTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.topic.TopicDeployment; -import org.apache.activemq.rest.util.Constants; -import org.apache.activemq.rest.util.CustomHeaderLinkStrategy; -import org.apache.activemq.rest.util.LinkHeaderLinkStrategy; +import org.apache.activemq.artemis.rest.topic.TopicDeployment; +import org.apache.activemq.artemis.rest.util.Constants; +import org.apache.activemq.artemis.rest.util.LinkHeaderLinkStrategy; +import org.apache.activemq.artemis.rest.util.CustomHeaderLinkStrategy; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -64,9 +64,9 @@ public class ClientAckTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link subscriptions = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); + Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); response = subscriptions.request().formParameter("autoAck", "false") .formParameter("durable", "true") .post(); @@ -76,7 +76,7 @@ public class ClientAckTopicTest extends MessageTestBase Assert.assertNotNull(sub1); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("poller: " + consumeNext); { @@ -88,12 +88,12 @@ public class ClientAckTopicTest extends MessageTestBase res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - Link ack = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); + Link ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); - Link session = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); // test timeout @@ -107,17 +107,17 @@ public class ClientAckTopicTest extends MessageTestBase ackRes.releaseConnection(); Assert.assertEquals(412, ackRes.getStatus()); System.out.println("**** Successfully failed ack"); - consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), ackRes, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), ackRes, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); } { ClientResponse res = consumeNext.request().header(Constants.WAIT_HEADER, "2").post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - Link ack = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); + Link ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); - consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); @@ -139,11 +139,11 @@ public class ClientAckTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link subscriptions = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); + Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); response = subscriptions.request().formParameter("autoAck", "false") .formParameter("durable", "true") .post(); @@ -151,7 +151,7 @@ public class ClientAckTopicTest extends MessageTestBase Assert.assertEquals(201, response.getStatus()); Link sub1 = response.getLocationLink(); Assert.assertNotNull(sub1); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -162,17 +162,17 @@ public class ClientAckTopicTest extends MessageTestBase res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - Link ack = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); + Link ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); - Link session = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), ackRes, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), ackRes, "acknowledge-next"); System.out.println("sending next..."); res = sender.request().body("text/plain", Integer.toString(2)).post(); @@ -183,10 +183,10 @@ public class ClientAckTopicTest extends MessageTestBase res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - ack = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); + ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); - MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); + getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); @@ -203,11 +203,11 @@ public class ClientAckTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link subscriptions = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); + Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); response = subscriptions.request().formParameter("autoAck", "false") .formParameter("durable", "false") .post(); @@ -215,7 +215,7 @@ public class ClientAckTopicTest extends MessageTestBase Assert.assertEquals(201, response.getStatus()); Link sub1 = response.getLocationLink(); Assert.assertNotNull(sub1); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -226,17 +226,17 @@ public class ClientAckTopicTest extends MessageTestBase res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - Link ack = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); + Link ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); - Link session = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), ackRes, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), ackRes, "acknowledge-next"); System.out.println("sending next..."); res = sender.request().body("text/plain", Integer.toString(2)).post(); @@ -247,10 +247,10 @@ public class ClientAckTopicTest extends MessageTestBase res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); - ack = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); + ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); Assert.assertNotNull(ack); - MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); + getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println("consumeNext: " + consumeNext); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); @@ -267,9 +267,9 @@ public class ClientAckTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link subscriptions = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); + Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); response = subscriptions.request().formParameter("autoAck", "false") .formParameter("durable", "true") .post(); @@ -277,13 +277,13 @@ public class ClientAckTopicTest extends MessageTestBase Assert.assertEquals(201, response.getStatus()); Link sub1 = response.getLocationLink(); Assert.assertNotNull(sub1); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("poller: " + consumeNext); ClientResponse res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(503, res.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); System.out.println(consumeNext); res = sender.request().body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); @@ -292,7 +292,7 @@ public class ClientAckTopicTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals(Integer.toString(1), res.getEntity()); res.releaseConnection(); - Link ack = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); + Link ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); @@ -311,7 +311,7 @@ public class ClientAckTopicTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals(Integer.toString(2), res.getEntity()); res.releaseConnection(); - ack = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); + ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); @@ -321,7 +321,7 @@ public class ClientAckTopicTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals(Integer.toString(3), res.getEntity()); res.releaseConnection(); - ack = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); + ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); System.out.println("ack: " + ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/CreateDestinationTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/CreateDestinationTest.java similarity index 78% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/CreateDestinationTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/CreateDestinationTest.java index 443815c1ed..6700b26d49 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/CreateDestinationTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/CreateDestinationTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.util.Constants; +import org.apache.activemq.artemis.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -47,12 +47,12 @@ public class CreateDestinationTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -63,9 +63,9 @@ public class CreateDestinationTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); System.out.println("consumeNext: " + consumeNext); @@ -78,9 +78,9 @@ public class CreateDestinationTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("2", res.getEntity(String.class)); res.releaseConnection(); - session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); + getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); System.out.println("consumeNext: " + consumeNext); res = session.request().delete(); @@ -102,8 +102,8 @@ public class CreateDestinationTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); - Link subscriptions = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); + Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); + Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); ClientResponse res = subscriptions.request().post(); @@ -111,7 +111,7 @@ public class CreateDestinationTest extends MessageTestBase Assert.assertEquals(201, res.getStatus()); Link sub1 = res.getLocationLink(); Assert.assertNotNull(sub1); - Link consumeNext1 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + Link consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext1); System.out.println("consumeNext1: " + consumeNext1); @@ -121,7 +121,7 @@ public class CreateDestinationTest extends MessageTestBase Assert.assertEquals(201, res.getStatus()); Link sub2 = res.getLocationLink(); Assert.assertNotNull(sub2); - Link consumeNext2 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + Link consumeNext2 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext1); @@ -136,25 +136,25 @@ public class CreateDestinationTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); - consumeNext1 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); res = consumeNext1.request().post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("2", res.getEntity(String.class)); res.releaseConnection(); - consumeNext1 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); res = consumeNext2.request().post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); - consumeNext2 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + consumeNext2 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); res = consumeNext2.request().post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("2", res.getEntity(String.class)); res.releaseConnection(); - consumeNext2 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + consumeNext2 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); res = sub1.request().delete(); res.releaseConnection(); Assert.assertEquals(204, res.getStatus()); diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/DupQueueTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/DupQueueTest.java similarity index 73% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/DupQueueTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/DupQueueTest.java index 981b605753..17af5dc4b0 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/DupQueueTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/DupQueueTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.queue.QueueDeployment; -import org.apache.activemq.rest.util.Constants; +import org.apache.activemq.artemis.rest.queue.QueueDeployment; +import org.apache.activemq.artemis.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -42,12 +42,12 @@ public class DupQueueTest extends MessageTestBase ClientResponse response = request.head(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -62,7 +62,7 @@ public class DupQueueTest extends MessageTestBase res = sender.request().body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); - sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "create-next"); + sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "create-next"); res = sender.request().body("text/plain", Integer.toString(2)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); @@ -71,18 +71,18 @@ public class DupQueueTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); System.out.println("consumeNext: " + consumeNext); res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("2", res.getEntity(String.class)); res.releaseConnection(); - session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); System.out.println("consumeNext: " + consumeNext); res = consumeNext.request().post(String.class); res.releaseConnection(); @@ -108,12 +108,12 @@ public class DupQueueTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create-with-id"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create-with-id"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("poller: " + consumeNext); ClientResponse res = sender.request().pathParameter("id", "1").body("text/plain", Integer.toString(1)).post(); @@ -122,7 +122,7 @@ public class DupQueueTest extends MessageTestBase res = sender.request().body("text/plain", Integer.toString(1)).pathParameter("id", "1").post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); - sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "create-next"); + sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "create-next"); res = sender.request().body("text/plain", Integer.toString(2)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); @@ -131,18 +131,18 @@ public class DupQueueTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); System.out.println("consumeNext: " + consumeNext); res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("2", res.getEntity(String.class)); res.releaseConnection(); - session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); System.out.println("consumeNext: " + consumeNext); res = consumeNext.request().post(String.class); res.releaseConnection(); diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/Embedded.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Embedded.java similarity index 83% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/Embedded.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Embedded.java index 0252504d7d..0a981c5eee 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/Embedded.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Embedded.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServers; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServers; +import org.apache.activemq.artemis.rest.MessageServiceConfiguration; +import org.apache.activemq.artemis.rest.MessageServiceManager; import org.jboss.resteasy.plugins.server.tjws.TJWSEmbeddedJaxrsServer; -import org.apache.activemq.rest.MessageServiceConfiguration; -import org.apache.activemq.rest.MessageServiceManager; import org.jboss.resteasy.test.TestPortProvider; public class Embedded diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java similarity index 93% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java index 47255c04ad..68bbdf5d5d 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -26,12 +26,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.api.jms.JMSFactoryType; -import org.apache.activemq.core.config.impl.FileSecurityConfiguration; -import org.apache.activemq.rest.HttpHeaderProperty; -import org.apache.activemq.rest.integration.EmbeddedRestActiveMQJMS; -import org.apache.activemq.spi.core.naming.BindingRegistry; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.core.config.impl.FileSecurityConfiguration; +import org.apache.activemq.artemis.rest.HttpHeaderProperty; +import org.apache.activemq.artemis.rest.integration.EmbeddedRestActiveMQJMS; +import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/FindDestinationTest.java similarity index 77% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/FindDestinationTest.java index 4255410d62..96eff2a972 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/FindDestinationTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -37,12 +37,12 @@ public class FindDestinationTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -53,7 +53,7 @@ public class FindDestinationTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); System.out.println("session: " + session); Assert.assertEquals(204, session.request().delete().getStatus()); } @@ -67,15 +67,15 @@ public class FindDestinationTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); - Link subscriptions = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); + Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); + Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); ClientResponse res = subscriptions.request().post(); Assert.assertEquals(201, res.getStatus()); Link sub1 = res.getLocationLink(); res.releaseConnection(); Assert.assertNotNull(sub1); - Link consumeNext1 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + Link consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext1); System.out.println("consumeNext1: " + consumeNext1); @@ -84,7 +84,7 @@ public class FindDestinationTest extends MessageTestBase Link sub2 = res.getLocationLink(); res.releaseConnection(); Assert.assertNotNull(sub2); - Link consumeNext2 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + Link consumeNext2 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext1); res = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -98,7 +98,7 @@ public class FindDestinationTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); - consumeNext1 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); res = consumeNext1.request().post(String.class); Assert.assertEquals(200, res.getStatus()); @@ -109,7 +109,7 @@ public class FindDestinationTest extends MessageTestBase Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); - consumeNext2 = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); + consumeNext2 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); res = consumeNext2.request().post(String.class); Assert.assertEquals(200, res.getStatus()); diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/JMSTest.java similarity index 87% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/JMSTest.java index 9c246b8022..fc0a465d9c 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/JMSTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -30,11 +30,11 @@ import java.io.Serializable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory; -import org.apache.activemq.rest.HttpHeaderProperty; -import org.apache.activemq.rest.Jms; -import org.apache.activemq.rest.queue.QueueDeployment; +import org.apache.activemq.artemis.rest.HttpHeaderProperty; +import org.apache.activemq.artemis.rest.Jms; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory; +import org.apache.activemq.artemis.rest.queue.QueueDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -193,9 +193,9 @@ public class JMSTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("consume-next: " + consumeNext); // test that Accept header is used to set content-type @@ -235,12 +235,12 @@ public class JMSTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("consume-next: " + consumeNext); // test that Accept header is used to set content-type @@ -257,7 +257,7 @@ public class JMSTest extends MessageTestBase Order order2 = res.getEntity(Order.class); res.releaseConnection(); Assert.assertEquals(order, order2); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext); } @@ -274,7 +274,7 @@ public class JMSTest extends MessageTestBase Order order2 = res.getEntity(Order.class); res.releaseConnection(); Assert.assertEquals(order, order2); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext); } @@ -291,7 +291,7 @@ public class JMSTest extends MessageTestBase Order order2 = res.getEntity(Order.class); res.releaseConnection(); Assert.assertEquals(order, order2); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext); } } diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/MessageTestBase.java similarity index 91% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/MessageTestBase.java index 690d8cdc8d..abc558a888 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/MessageTestBase.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; import java.lang.reflect.Field; -import org.apache.activemq.rest.MessageServiceManager; -import org.apache.activemq.rest.util.LinkHeaderLinkStrategy; -import org.apache.activemq.rest.util.LinkStrategy; +import org.apache.activemq.artemis.rest.MessageServiceManager; +import org.apache.activemq.artemis.rest.util.LinkHeaderLinkStrategy; +import org.apache.activemq.artemis.rest.util.LinkStrategy; import org.jboss.resteasy.client.ClientExecutor; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.client.core.BaseClientResponse; diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushQueueConsumerTest.java similarity index 91% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushQueueConsumerTest.java index a2a51f712e..bff1dade1a 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushQueueConsumerTest.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServers; -import org.apache.activemq.rest.MessageServiceManager; -import org.apache.activemq.rest.queue.QueueDeployment; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; -import org.apache.activemq.rest.queue.push.xml.XmlLink; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServers; +import org.apache.activemq.artemis.rest.MessageServiceManager; +import org.apache.activemq.artemis.rest.queue.QueueDeployment; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushTopicConsumerTest.java similarity index 90% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushTopicConsumerTest.java index 45c8f64b2a..df02eecaf2 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushTopicConsumerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; import javax.ws.rs.Consumes; import javax.ws.rs.POST; @@ -22,18 +22,18 @@ import javax.ws.rs.Path; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServers; -import org.apache.activemq.rest.MessageServiceManager; -import org.apache.activemq.rest.queue.push.xml.XmlLink; -import org.apache.activemq.rest.topic.PushTopicRegistration; -import org.apache.activemq.rest.topic.TopicDeployment; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServers; +import org.apache.activemq.artemis.rest.MessageServiceManager; +import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink; +import org.apache.activemq.artemis.rest.topic.PushTopicRegistration; +import org.apache.activemq.artemis.rest.topic.TopicDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java similarity index 81% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java index bb0cb0c38b..462c66a25e 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.queue.QueueDeployment; -import org.apache.activemq.rest.queue.push.ActiveMQPushStrategy; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; -import org.apache.activemq.rest.queue.push.xml.XmlLink; -import org.apache.activemq.rest.util.Constants; +import org.apache.activemq.artemis.rest.util.Constants; +import org.apache.activemq.artemis.rest.queue.QueueDeployment; +import org.apache.activemq.artemis.rest.queue.push.ActiveMQPushStrategy; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -59,12 +59,12 @@ public class PushQueueConsumerTest extends MessageTestBase deployQueue(queueToPushTo); ClientResponse queueResponse = Util.head(new ClientRequest(generateURL(Util.getUrlPath(queue)))); - Link destination = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "create"); - Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "push-consumers"); + Link destination = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "create"); + Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "push-consumers"); ClientResponse queueToPushToResponse = Util.head(new ClientRequest(generateURL(Util.getUrlPath(queueToPushTo)))); ClientResponse autoAckResponse = setAutoAck(queueToPushToResponse, true); - destinationForConsumption = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), autoAckResponse, "consume-next"); + destinationForConsumption = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), autoAckResponse, "consume-next"); pushSubscription = createPushRegistration(queueToPushTo, pushSubscriptions, PushRegistrationType.BRIDGE); @@ -108,12 +108,12 @@ public class PushQueueConsumerTest extends MessageTestBase deployQueue(queueToPushTo); ClientResponse queueResponse = Util.head(new ClientRequest(generateURL(Util.getUrlPath(queue)))); - Link destinationForSend = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "create"); - Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "push-consumers"); + Link destinationForSend = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "create"); + Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "push-consumers"); ClientResponse queueToPushToResponse = Util.head(new ClientRequest(generateURL(Util.getUrlPath(queueToPushTo)))); ClientResponse autoAckResponse = setAutoAck(queueToPushToResponse, true); - destinationForConsumption = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), autoAckResponse, "consume-next"); + destinationForConsumption = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), autoAckResponse, "consume-next"); pushSubscription = createPushRegistration(queueToPushTo, pushSubscriptions, PushRegistrationType.CLASS); @@ -147,14 +147,14 @@ public class PushQueueConsumerTest extends MessageTestBase deployQueue(queueToPushTo); ClientResponse queueResponse = Util.head(new ClientRequest(generateURL(Util.getUrlPath(queue)))); - Link destinationForSend = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "create"); - Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "push-consumers"); + Link destinationForSend = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "create"); + Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "push-consumers"); ClientResponse queueToPushToResponse = Util.head(new ClientRequest(generateURL(Util.getUrlPath(queueToPushTo)))); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueToPushToResponse, "pull-consumers"); - Link createWithId = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueToPushToResponse, "create-with-id"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueToPushToResponse, "pull-consumers"); + Link createWithId = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueToPushToResponse, "create-with-id"); ClientResponse autoAckResponse = Util.setAutoAck(consumers, true); - destinationForConsumption = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), autoAckResponse, "consume-next"); + destinationForConsumption = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), autoAckResponse, "consume-next"); pushSubscription = createPushRegistration(createWithId.getHref(), pushSubscriptions, PushRegistrationType.TEMPLATE); @@ -228,8 +228,8 @@ public class PushQueueConsumerTest extends MessageTestBase server.getJaxrsServer().getDeployment().getRegistry().addPerRequestResource(MyResource.class); ClientResponse queueResponse = Util.head(new ClientRequest(generateURL(Util.getUrlPath(queue)))); - Link destinationForSend = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "create"); - Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "push-consumers"); + Link destinationForSend = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "create"); + Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "push-consumers"); pushSubscription = createPushRegistration(generateURL("/my"), pushSubscriptions, PushRegistrationType.URI); @@ -264,8 +264,8 @@ public class PushQueueConsumerTest extends MessageTestBase server.getJaxrsServer().getDeployment().getRegistry().addPerRequestResource(MyConcurrentResource.class); ClientResponse queueResponse = Util.head(new ClientRequest(generateURL(Util.getUrlPath(queue)))); - Link destinationForSend = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "create"); - Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "push-consumers"); + Link destinationForSend = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "create"); + Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), queueResponse, "push-consumers"); pushSubscription = createPushRegistration(generateURL("/myConcurrent"), pushSubscriptions, PushRegistrationType.URI, CONCURRENT); @@ -316,7 +316,7 @@ public class PushQueueConsumerTest extends MessageTestBase private ClientResponse setAutoAck(ClientResponse response, boolean ack) throws Exception { - Link pullConsumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link pullConsumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); ClientResponse autoAckResponse = pullConsumers.request().formParameter("autoAck", Boolean.toString(ack)).post(); autoAckResponse.releaseConnection(); Assert.assertEquals(201, autoAckResponse.getStatus()); @@ -327,7 +327,7 @@ public class PushQueueConsumerTest extends MessageTestBase { if (consumerResponse != null) { - Link consumer = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), consumerResponse, "consumer"); + Link consumer = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), consumerResponse, "consumer"); ClientResponse response = consumer.request().delete(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java similarity index 82% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java index e9e3d94f6b..f8fa9bf917 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; import javax.ws.rs.PUT; import javax.ws.rs.Path; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.rest.queue.QueueDeployment; -import org.apache.activemq.rest.queue.push.ActiveMQPushStrategy; -import org.apache.activemq.rest.queue.push.xml.XmlLink; -import org.apache.activemq.rest.topic.PushTopicRegistration; -import org.apache.activemq.rest.topic.TopicDeployment; +import org.apache.activemq.artemis.rest.queue.QueueDeployment; +import org.apache.activemq.artemis.rest.queue.push.ActiveMQPushStrategy; +import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink; +import org.apache.activemq.artemis.rest.topic.PushTopicRegistration; +import org.apache.activemq.artemis.rest.topic.TopicDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -70,18 +70,18 @@ public class PushTopicConsumerTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); + Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); System.out.println("push subscriptions: " + pushSubscriptions); request = new ClientRequest(generateURL("/queues/testBridgeForwardQueue")); response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); PushTopicRegistration reg = new PushTopicRegistration(); reg.setDurable(false); @@ -102,7 +102,7 @@ public class PushTopicConsumerTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); response = session.request().delete(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -130,18 +130,18 @@ public class PushTopicConsumerTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); + Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); System.out.println("push subscriptions: " + pushSubscriptions); request = new ClientRequest(generateURL("/queues/testClassForwardQueue")); response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); PushTopicRegistration reg = new PushTopicRegistration(); reg.setDurable(false); @@ -162,7 +162,7 @@ public class PushTopicConsumerTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); response = session.request().delete(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -190,19 +190,19 @@ public class PushTopicConsumerTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); + Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); System.out.println("push subscriptions: " + pushSubscriptions); request = new ClientRequest(generateURL("/queues/testTemplateForwardQueue")); response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - Link createWithId = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create-with-id"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link createWithId = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create-with-id"); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); PushTopicRegistration reg = new PushTopicRegistration(); reg.setDurable(false); @@ -223,7 +223,7 @@ public class PushTopicConsumerTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); response = session.request().delete(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -289,9 +289,9 @@ public class PushTopicConsumerTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); + Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); System.out.println("push subscriptions: " + pushSubscriptions); PushTopicRegistration reg = new PushTopicRegistration(); @@ -334,9 +334,9 @@ public class PushTopicConsumerTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); + Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); System.out.println("push subscriptions: " + pushSubscriptions); PushTopicRegistration reg = new PushTopicRegistration(); diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java similarity index 80% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java index 917dd5bf74..b6386271f8 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; import java.util.HashMap; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.client.impl.ServerLocatorImpl; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServers; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingQueueTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingQueueTest.java similarity index 99% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingQueueTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingQueueTest.java index f9666cafa2..70894ef7ca 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingQueueTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingQueueTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.queue.QueueDeployment; -import org.apache.activemq.rest.util.Constants; +import org.apache.activemq.artemis.rest.queue.QueueDeployment; +import org.apache.activemq.artemis.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingTopicTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingTopicTest.java similarity index 75% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingTopicTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingTopicTest.java index 9a3eb785ff..ad276cb56f 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingTopicTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingTopicTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.topic.TopicDeployment; -import org.apache.activemq.rest.util.Constants; +import org.apache.activemq.artemis.rest.topic.TopicDeployment; +import org.apache.activemq.artemis.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -57,9 +57,9 @@ public class RepostingTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); @@ -76,20 +76,20 @@ public class RepostingTopicTest extends MessageTestBase response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("resource consume-next: " + consumeNext); response = consumeNext.request().post(String.class); Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); response = consumeNext.request().header("Accept-Wait", "2").post(String.class); Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); response = session.request().delete(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -103,9 +103,9 @@ public class RepostingTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = consumers.request().formParameter("name", "bill").formParameter("durable", "true").post(); response.releaseConnection(); @@ -124,20 +124,20 @@ public class RepostingTopicTest extends MessageTestBase response = consumers.request().formParameter("name", "bill").formParameter("durable", "true").post(); response.releaseConnection(); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("resource consume-next: " + consumeNext); response = consumeNext.request().header("Accept-Wait", "2").post(String.class); Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); response = consumeNext.request().header("Accept-Wait", "2").post(String.class); Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); response = session.request().delete(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -151,9 +151,9 @@ public class RepostingTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); @@ -171,13 +171,13 @@ public class RepostingTopicTest extends MessageTestBase response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("resource consume-next: " + consumeNext); response = consumeNext.request().header("Accept-Wait", "2").post(String.class); response.releaseConnection(); Assert.assertEquals(503, response.getStatus()); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); response = session.request().delete(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -191,12 +191,12 @@ public class RepostingTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -207,9 +207,9 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("session 1st consumeNext: " + consumeNext); @@ -235,9 +235,9 @@ public class RepostingTopicTest extends MessageTestBase response.releaseConnection(); - session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("session 2nd consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(3)).post(); @@ -262,12 +262,12 @@ public class RepostingTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -278,9 +278,9 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); Link firstConsumeNext = consumeNext; System.out.println("session 1st consumeNext: " + consumeNext); @@ -293,9 +293,9 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); - session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("session 2nd consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(3)).post(); @@ -324,12 +324,12 @@ public class RepostingTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -340,18 +340,18 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("session 1st consumeNext: " + consumeNext); // test timeout here response = consumeNext.request().post(String.class); response.releaseConnection(); Assert.assertEquals(503, response.getStatus()); - session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); System.out.println("session: " + session); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("session 2nd consumeNext: " + consumeNext); @@ -376,12 +376,12 @@ public class RepostingTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, false); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -392,9 +392,9 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); System.out.println("session: " + session); - Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); System.out.println("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); @@ -405,7 +405,7 @@ public class RepostingTopicTest extends MessageTestBase response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("session 1st acknowledge-next: " + consumeNext); @@ -429,7 +429,7 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); System.out.println("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); @@ -448,12 +448,12 @@ public class RepostingTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, false); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -464,9 +464,9 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); System.out.println("session: " + session); - Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); System.out.println("ack: " + ack); response = ack.request().formParameter("acknowledge", "false").post(); response.releaseConnection(); @@ -477,7 +477,7 @@ public class RepostingTopicTest extends MessageTestBase response = ack.request().formParameter("acknowledge", "false").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("session 1st acknowledge-next: " + consumeNext); @@ -497,7 +497,7 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); System.out.println("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); @@ -516,12 +516,12 @@ public class RepostingTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, false); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -532,9 +532,9 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); System.out.println("session: " + session); - Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); System.out.println("ack: " + ack); response = ack.request().formParameter("acknowledge", "false").post(); response.releaseConnection(); @@ -543,7 +543,7 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(412, response.getStatus()); System.out.println(response.getEntity(String.class)); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("session 1st acknowledge-next: " + consumeNext); @@ -563,7 +563,7 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); System.out.println("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); @@ -582,12 +582,12 @@ public class RepostingTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, false); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -598,9 +598,9 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); System.out.println("session: " + session); - Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); System.out.println("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); @@ -609,7 +609,7 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(412, response.getStatus()); System.out.println(response.getEntity(String.class)); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("session 1st acknowledge-next: " + consumeNext); @@ -633,7 +633,7 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); System.out.println("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); @@ -652,12 +652,12 @@ public class RepostingTopicTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, false); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -668,15 +668,15 @@ public class RepostingTopicTest extends MessageTestBase Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); - Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); + Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); System.out.println("session: " + session); - Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Link oldAck = ack; System.out.println("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("session 1st acknowledge-next: " + consumeNext); Link firstConsumeNext = consumeNext; @@ -687,19 +687,19 @@ public class RepostingTopicTest extends MessageTestBase response = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); System.out.println("ack: " + ack); response = oldAck.request().formParameter("acknowledge", "true").post(); Assert.assertEquals(412, response.getStatus()); System.out.println(response.getEntity(String.class)); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); response = consumeNext.request().post(String.class); diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RoundtripTimeTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java similarity index 80% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/RoundtripTimeTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java index 87075d6562..648a0d4917 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RoundtripTimeTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.queue.QueueDeployment; +import org.apache.activemq.artemis.rest.queue.QueueDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -41,12 +41,12 @@ public class RoundtripTimeTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("consume-next: " + consumeNext); @@ -63,7 +63,7 @@ public class RoundtripTimeTest extends MessageTestBase for (int i = 0; i < num; i++) { response = consumeNext.request().post(String.class); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); Assert.assertEquals(200, response.getStatus()); Assert.assertEquals(Integer.toString(i + 1), response.getEntity(String.class)); response.releaseConnection(); diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java similarity index 90% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java index 1c74febdb5..6b9ade7268 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -27,12 +27,12 @@ import javax.ws.rs.Path; import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; -import org.apache.activemq.jms.client.ActiveMQDestination; -import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory; -import org.apache.activemq.rest.HttpHeaderProperty; -import org.apache.activemq.rest.queue.push.xml.XmlLink; -import org.apache.activemq.rest.topic.PushTopicRegistration; -import org.apache.activemq.rest.topic.TopicDeployment; +import org.apache.activemq.artemis.jms.client.ActiveMQDestination; +import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory; +import org.apache.activemq.artemis.rest.HttpHeaderProperty; +import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink; +import org.apache.activemq.artemis.rest.topic.PushTopicRegistration; +import org.apache.activemq.artemis.rest.topic.TopicDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -196,7 +196,7 @@ public class SelectorTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); System.out.println("push: " + consumers); PushTopicRegistration oneReg = new PushTopicRegistration(); @@ -270,18 +270,18 @@ public class SelectorTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = consumers.request().formParameter("autoAck", "true") .formParameter("selector", "MyTag = '1'").post(); response.releaseConnection(); - Link consumeOne = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeOne = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("consumeOne: " + consumeOne); response = consumers.request().formParameter("autoAck", "true") .formParameter("selector", "MyTag = '2'").post(); response.releaseConnection(); - Link consumeTwo = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeTwo = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("consumeTwo: " + consumeTwo); @@ -326,7 +326,7 @@ public class SelectorTest extends MessageTestBase Assert.assertEquals("application/xml", response.getHeaders().getFirst("Content-Type").toString().toLowerCase()); Order order2 = response.getEntity(Order.class); Assert.assertEquals(order, order2); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); Assert.assertNotNull(consumeNext); response.releaseConnection(); return consumeNext; diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/SessionTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java similarity index 72% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/SessionTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java index 9890c26d9d..f5b7a5b903 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/SessionTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.queue.QueueDeployment; -import org.apache.activemq.rest.topic.TopicDeployment; -import org.apache.activemq.rest.util.Constants; +import org.apache.activemq.artemis.rest.topic.TopicDeployment; +import org.apache.activemq.artemis.rest.util.Constants; +import org.apache.activemq.artemis.rest.queue.QueueDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -51,15 +51,15 @@ public class SessionTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link session = response.getLocationLink(); response = session.request().head(); response.releaseConnection(); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -71,7 +71,7 @@ public class SessionTest extends MessageTestBase Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); response = session.request().get(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -82,7 +82,7 @@ public class SessionTest extends MessageTestBase Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); response = session.request().head(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); response = sender.request().body("text/plain", Integer.toString(3)).post(); response.releaseConnection(); @@ -107,15 +107,15 @@ public class SessionTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link session = response.getLocationLink(); response = session.request().head(); response.releaseConnection(); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -128,7 +128,7 @@ public class SessionTest extends MessageTestBase response.releaseConnection(); response = session.request().get(); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -140,7 +140,7 @@ public class SessionTest extends MessageTestBase response.releaseConnection(); response = session.request().head(); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); response = sender.request().body("text/plain", Integer.toString(3)).post(); response.releaseConnection(); @@ -165,15 +165,15 @@ public class SessionTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link session = response.getLocationLink(); response = session.request().head(); response.releaseConnection(); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("consume-next: " + consumeNext); Link ack = null; @@ -188,9 +188,9 @@ public class SessionTest extends MessageTestBase response.releaseConnection(); response = session.request().get(); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); Assert.assertNull(consumeNext); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Assert.assertNotNull(ack); // acknowledge @@ -198,9 +198,9 @@ public class SessionTest extends MessageTestBase response.releaseConnection(); response = session.request().head(); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); Assert.assertNotNull(consumeNext); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Assert.assertNull(ack); response = sender.request().body("text/plain", Integer.toString(2)).post(); @@ -214,9 +214,9 @@ public class SessionTest extends MessageTestBase response.releaseConnection(); response = session.request().get(); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); Assert.assertNull(consumeNext); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Assert.assertNotNull(ack); // acknowledge @@ -224,9 +224,9 @@ public class SessionTest extends MessageTestBase response.releaseConnection(); response = session.request().head(); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); Assert.assertNotNull(consumeNext); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Assert.assertNull(ack); response = session.request().delete(); @@ -242,15 +242,15 @@ public class SessionTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link session = response.getLocationLink(); response = session.request().head(); response.releaseConnection(); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); System.out.println("consume-next: " + consumeNext); Link ack = null; @@ -265,9 +265,9 @@ public class SessionTest extends MessageTestBase response.releaseConnection(); response = session.request().get(); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); Assert.assertNull(consumeNext); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Assert.assertNotNull(ack); // acknowledge @@ -275,9 +275,9 @@ public class SessionTest extends MessageTestBase response.releaseConnection(); response = session.request().head(); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); Assert.assertNotNull(consumeNext); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Assert.assertNull(ack); response = sender.request().body("text/plain", Integer.toString(2)).post(); @@ -291,9 +291,9 @@ public class SessionTest extends MessageTestBase response.releaseConnection(); response = session.request().get(); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); Assert.assertNull(consumeNext); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Assert.assertNotNull(ack); // acknowledge @@ -301,9 +301,9 @@ public class SessionTest extends MessageTestBase response.releaseConnection(); response = session.request().head(); response.releaseConnection(); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); Assert.assertNotNull(consumeNext); - ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); + ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Assert.assertNull(ack); response = session.request().delete(); diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java similarity index 83% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java index 93b8818e7b..1667933768 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.MessageHandler; -import org.apache.activemq.rest.ActiveMQ; -import org.apache.activemq.rest.queue.QueueDeployment; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.MessageHandler; +import org.apache.activemq.artemis.rest.ActiveMQ; +import org.apache.activemq.artemis.rest.queue.QueueDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -132,12 +132,12 @@ public class TransformTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("consume-next: " + consumeNext); // test that Accept header is used to set content-type @@ -154,7 +154,7 @@ public class TransformTest extends MessageTestBase Order order2 = response.getEntity(Order.class); response.releaseConnection(); Assert.assertEquals(order, order2); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); Assert.assertNotNull(consumeNext); } @@ -171,7 +171,7 @@ public class TransformTest extends MessageTestBase Order order2 = response.getEntity(Order.class); response.releaseConnection(); Assert.assertEquals(order, order2); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); Assert.assertNotNull(consumeNext); } @@ -188,7 +188,7 @@ public class TransformTest extends MessageTestBase Order order2 = response.getEntity(Order.class); response.releaseConnection(); Assert.assertEquals(order, order2); - consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); Assert.assertNotNull(consumeNext); } } @@ -233,12 +233,12 @@ public class TransformTest extends MessageTestBase ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); - Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); + Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); System.out.println("create: " + sender); - Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); + Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); System.out.println("pull: " + consumers); response = Util.setAutoAck(consumers, true); - Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); + Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); System.out.println("consume-next: " + consumeNext); // test that Accept header is used to set content-type diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/Util.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Util.java similarity index 94% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/Util.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Util.java index c592e2f3ab..88bfe638a0 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/Util.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Util.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.util.Constants; +import org.apache.activemq.artemis.rest.util.Constants; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/XmlTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java similarity index 93% rename from activemq-rest/src/test/java/org/apache/activemq/rest/test/XmlTest.java rename to artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java index cbb06b71af..b700f852da 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/XmlTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.rest.test; +package org.apache.activemq.artemis.rest.test; -import org.apache.activemq.rest.queue.push.xml.PushRegistration; +import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; import org.junit.Test; import javax.xml.bind.JAXBContext; diff --git a/activemq-rest/src/test/resources/activemq-configuration.xml b/artemis-rest/src/test/resources/activemq-configuration.xml similarity index 100% rename from activemq-rest/src/test/resources/activemq-configuration.xml rename to artemis-rest/src/test/resources/activemq-configuration.xml diff --git a/activemq-rest/src/test/resources/activemq-rest.xml b/artemis-rest/src/test/resources/activemq-rest.xml similarity index 100% rename from activemq-rest/src/test/resources/activemq-rest.xml rename to artemis-rest/src/test/resources/activemq-rest.xml diff --git a/activemq-rest/src/test/resources/activemq-roles.properties b/artemis-rest/src/test/resources/activemq-roles.properties similarity index 100% rename from activemq-rest/src/test/resources/activemq-roles.properties rename to artemis-rest/src/test/resources/activemq-roles.properties diff --git a/activemq-rest/src/test/resources/activemq-users.properties b/artemis-rest/src/test/resources/activemq-users.properties similarity index 100% rename from activemq-rest/src/test/resources/activemq-users.properties rename to artemis-rest/src/test/resources/activemq-users.properties diff --git a/activemq-selector/pom.xml b/artemis-selector/pom.xml similarity index 92% rename from activemq-selector/pom.xml rename to artemis-selector/pom.xml index 43a868d6da..209da20fde 100644 --- a/activemq-selector/pom.xml +++ b/artemis-selector/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-selector + artemis-selector jar ActiveMQ Artemis Selector Implementation @@ -32,14 +32,14 @@ - + xalan xalan 2.6.0 true - + junit junit @@ -67,7 +67,7 @@ - + diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ArithmeticExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java similarity index 99% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/ArithmeticExpression.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java index 9ccb7f708b..4e5cdab48f 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ArithmeticExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; /** diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BinaryExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BinaryExpression.java similarity index 98% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/BinaryExpression.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BinaryExpression.java index 0754271978..593794b111 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BinaryExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BinaryExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; /** diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BooleanExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BooleanExpression.java similarity index 95% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/BooleanExpression.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BooleanExpression.java index 43bff45327..dbbdd5bc9d 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BooleanExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BooleanExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; /** diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ComparisonExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java similarity index 99% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/ComparisonExpression.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java index cbda36f2a3..a2e3e540db 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ComparisonExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; import java.util.HashSet; import java.util.List; diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ConstantExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java similarity index 98% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/ConstantExpression.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java index ac847b083f..51eebd93eb 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ConstantExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; import java.math.BigDecimal; diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Expression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Expression.java similarity index 95% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/Expression.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Expression.java index f03e4cdc12..720fd6fb97 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Expression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Expression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; /** diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/FilterException.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/FilterException.java similarity index 95% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/FilterException.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/FilterException.java index 4b40624c7a..b6073f7d59 100644 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/FilterException.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/FilterException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; public class FilterException extends Exception { diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Filterable.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Filterable.java similarity index 96% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/Filterable.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Filterable.java index 320b4f7f51..6b3d7d247b 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Filterable.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Filterable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; /** * A Filterable is the object being evaluated by the filters. It provides diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/LogicExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/LogicExpression.java similarity index 98% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/LogicExpression.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/LogicExpression.java index 2d70c859b4..c62b46d855 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/LogicExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/LogicExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; /** diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/PropertyExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/PropertyExpression.java similarity index 97% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/PropertyExpression.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/PropertyExpression.java index f9860c39e6..7dcae01d9f 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/PropertyExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/PropertyExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; /** diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/UnaryExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java similarity index 99% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/UnaryExpression.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java index 9a4eb73893..8d1644ca7f 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/UnaryExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; import java.math.BigDecimal; import java.util.Collection; diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XPathExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java similarity index 97% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/XPathExpression.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java index 10cd66183d..c20c1a56cf 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XPathExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; /** * Used to evaluate an XPath Expression in a JMS selector. diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XQueryExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java similarity index 96% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/XQueryExpression.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java index d47184e08a..49df141f26 100755 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XQueryExpression.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; /** diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XalanXPathEvaluator.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java similarity index 98% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/XalanXPathEvaluator.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java index fb631155d6..315773e5e8 100644 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XalanXPathEvaluator.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.filter; +package org.apache.activemq.artemis.selector.filter; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/package.html b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/package.html similarity index 100% rename from activemq-selector/src/main/java/org/apache/activemq/selector/filter/package.html rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/package.html diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/impl/LRUCache.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java similarity index 98% rename from activemq-selector/src/main/java/org/apache/activemq/selector/impl/LRUCache.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java index 4c535d8329..2a33880b19 100644 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/impl/LRUCache.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.impl; +package org.apache.activemq.artemis.selector.impl; import java.util.LinkedHashMap; import java.util.Map; diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/impl/SelectorParser.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java similarity index 90% rename from activemq-selector/src/main/java/org/apache/activemq/selector/impl/SelectorParser.java rename to artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java index 27c908162f..5c200fe311 100644 --- a/activemq-selector/src/main/java/org/apache/activemq/selector/impl/SelectorParser.java +++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector.impl; +package org.apache.activemq.artemis.selector.impl; import java.io.StringReader; -import org.apache.activemq.selector.filter.BooleanExpression; -import org.apache.activemq.selector.filter.ComparisonExpression; -import org.apache.activemq.selector.filter.FilterException; -import org.apache.activemq.selector.hyphenated.HyphenatedParser; -import org.apache.activemq.selector.strict.StrictParser; +import org.apache.activemq.artemis.selector.filter.BooleanExpression; +import org.apache.activemq.artemis.selector.filter.ComparisonExpression; +import org.apache.activemq.artemis.selector.filter.FilterException; +import org.apache.activemq.artemis.selector.hyphenated.HyphenatedParser; +import org.apache.activemq.artemis.selector.strict.StrictParser; /** */ diff --git a/activemq-selector/src/main/javacc/HyphenatedParser.jj b/artemis-selector/src/main/javacc/HyphenatedParser.jj similarity index 85% rename from activemq-selector/src/main/javacc/HyphenatedParser.jj rename to artemis-selector/src/main/javacc/HyphenatedParser.jj index c58dd4d160..6e78c673b2 100755 --- a/activemq-selector/src/main/javacc/HyphenatedParser.jj +++ b/artemis-selector/src/main/javacc/HyphenatedParser.jj @@ -47,16 +47,16 @@ PARSER_BEGIN(HyphenatedParser) * limitations under the License. */ -package org.apache.activemq.selector.hyphenated; +package org.apache.activemq.artemis.selector.hyphenated; import java.io.*; import java.util.*; -import org.apache.activemq.selector.filter.*; +import org.apache.activemq.artemis.selector.filter.*; -/** +/** * JMS Selector Parser generated by JavaCC - * + * * Do not edit this .java file directly - it is autogenerated from HyphenatedParser.jj */ public class HyphenatedParser { @@ -118,8 +118,8 @@ TOKEN [IGNORE_CASE] : < DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* (["l","L"])? > | < HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ > - | < OCTAL_LITERAL: "0" (["0"-"7"])* > - | < FLOATING_POINT_LITERAL: + | < OCTAL_LITERAL: "0" (["0"-"7"])* > + | < FLOATING_POINT_LITERAL: (["0"-"9"])+ "." (["0"-"9"])* ()? // matches: 5.5 or 5. or 5.5E10 or 5.E10 | "." (["0"-"9"])+ ()? // matches: .5 or .5E10 | (["0"-"9"])+ // matches: 5E10 @@ -143,7 +143,7 @@ BooleanExpression JmsSelector() : { ( left = orExpression() - ) + ) { return asBooleanExpression(left); } @@ -157,14 +157,14 @@ Expression orExpression() : } { ( - left = andExpression() - ( - right = andExpression() + left = andExpression() + ( + right = andExpression() { left = LogicExpression.createOR(asBooleanExpression(left), asBooleanExpression(right)); } )* - ) + ) { return left; } @@ -179,14 +179,14 @@ Expression andExpression() : } { ( - left = equalityExpression() - ( - right = equalityExpression() + left = equalityExpression() + ( + right = equalityExpression() { left = LogicExpression.createAND(asBooleanExpression(left), asBooleanExpression(right)); } )* - ) + ) { return left; } @@ -199,31 +199,31 @@ Expression equalityExpression() : } { ( - left = comparisonExpression() - ( - - "=" right = comparisonExpression() + left = comparisonExpression() + ( + + "=" right = comparisonExpression() { left = ComparisonExpression.createEqual(left, right); } - | - "<>" right = comparisonExpression() + | + "<>" right = comparisonExpression() { left = ComparisonExpression.createNotEqual(left, right); } - | + | LOOKAHEAD(2) { left = ComparisonExpression.createIsNull(left); } - | + | { left = ComparisonExpression.createIsNotNull(left); } )* - ) + ) { return left; } @@ -241,33 +241,33 @@ Expression comparisonExpression() : } { ( - left = addExpression() - ( - - ">" right = addExpression() + left = addExpression() + ( + + ">" right = addExpression() { left = ComparisonExpression.createGreaterThan(left, right); } - | - ">=" right = addExpression() + | + ">=" right = addExpression() { left = ComparisonExpression.createGreaterThanEqual(left, right); } - | - "<" right = addExpression() + | + "<" right = addExpression() { left = ComparisonExpression.createLessThan(left, right); } - | - "<=" right = addExpression() + | + "<=" right = addExpression() { left = ComparisonExpression.createLessThanEqual(left, right); } | { u=null; - } - t = stringLitteral() + } + t = stringLitteral() [ u = stringLitteral() ] { left = ComparisonExpression.createLike(left, t, u); @@ -276,7 +276,7 @@ Expression comparisonExpression() : LOOKAHEAD(2) { u=null; - } + } t = stringLitteral() [ u = stringLitteral() ] { left = ComparisonExpression.createNotLike(left, t, u); @@ -293,20 +293,20 @@ Expression comparisonExpression() : left = ComparisonExpression.createNotBetween(left, low, high); } | - - "(" + + "(" t = stringLitteral() { list = new ArrayList(); list.add( t ); } - ( + ( "," - t = stringLitteral() + t = stringLitteral() { list.add( t ); } - + )* ")" { @@ -314,28 +314,28 @@ Expression comparisonExpression() : } | LOOKAHEAD(2) - - "(" + + "(" t = stringLitteral() { list = new ArrayList(); list.add( t ); } - ( + ( "," - t = stringLitteral() + t = stringLitteral() { list.add( t ); } - + )* ")" { left = ComparisonExpression.createNotInFilter(left, list); } - + )* - ) + ) { return left; } @@ -347,21 +347,21 @@ Expression addExpression() : Expression right; } { - left = multExpr() - ( + left = multExpr() + ( LOOKAHEAD( ("+"|"-") multExpr()) ( - "+" right = multExpr() + "+" right = multExpr() { left = ArithmeticExpression.createPlus(left, right); } - | - "-" right = multExpr() + | + "-" right = multExpr() { left = ArithmeticExpression.createMinus(left, right); } ) - + )* { return left; @@ -374,23 +374,23 @@ Expression multExpr() : Expression right; } { - left = unaryExpr() - ( - "*" right = unaryExpr() + left = unaryExpr() + ( + "*" right = unaryExpr() { left = ArithmeticExpression.createMultiply(left, right); } - | - "/" right = unaryExpr() + | + "/" right = unaryExpr() { left = ArithmeticExpression.createDivide(left, right); } - | - "%" right = unaryExpr() + | + "%" right = unaryExpr() { left = ArithmeticExpression.createMod(left, right); } - + )* { return left; @@ -447,7 +447,7 @@ Expression primaryExpr() : left = variable() | "(" left = orExpression() ")" - ) + ) { return left; } @@ -468,55 +468,55 @@ ConstantExpression literal() : { left = new ConstantExpression(s); } - ) - | + ) + | ( t = { left = ConstantExpression.createFromDecimal(t.image); - } - ) - | + } + ) + | ( t = { left = ConstantExpression.createFromHex(t.image); - } - ) - | + } + ) + | ( t = { left = ConstantExpression.createFromOctal(t.image); - } - ) - | + } + ) + | ( t = { left = ConstantExpression.createFloat(t.image); - } - ) - | + } + ) + | ( { left = ConstantExpression.TRUE; - } - ) - | + } + ) + | ( { left = ConstantExpression.FALSE; - } - ) - | + } + ) + | ( { left = ConstantExpression.NULL; - } + } ) ) { @@ -531,18 +531,18 @@ String stringLitteral() : boolean first=true; } { - t = + t = { // Decode the sting value. String image = t.image; for( int i=1; i < image.length()-1; i++ ) { char c = image.charAt(i); if( c == '\'' ) - i++; + i++; rc.append(c); } return rc.toString(); - } + } } PropertyExpression variable() : diff --git a/activemq-selector/src/main/javacc/StrictParser.jj b/artemis-selector/src/main/javacc/StrictParser.jj similarity index 85% rename from activemq-selector/src/main/javacc/StrictParser.jj rename to artemis-selector/src/main/javacc/StrictParser.jj index bac0075246..fff6933ac1 100755 --- a/activemq-selector/src/main/javacc/StrictParser.jj +++ b/artemis-selector/src/main/javacc/StrictParser.jj @@ -47,16 +47,16 @@ PARSER_BEGIN(StrictParser) * limitations under the License. */ -package org.apache.activemq.selector.strict; +package org.apache.activemq.artemis.selector.strict; import java.io.*; import java.util.*; -import org.apache.activemq.selector.filter.*; +import org.apache.activemq.artemis.selector.filter.*; -/** +/** * JMS Selector Parser generated by JavaCC - * + * * Do not edit this .java file directly - it is autogenerated from StrictParser.jj */ public class StrictParser { @@ -118,8 +118,8 @@ TOKEN [IGNORE_CASE] : < DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* (["l","L"])? > | < HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ > - | < OCTAL_LITERAL: "0" (["0"-"7"])* > - | < FLOATING_POINT_LITERAL: + | < OCTAL_LITERAL: "0" (["0"-"7"])* > + | < FLOATING_POINT_LITERAL: (["0"-"9"])+ "." (["0"-"9"])* ()? // matches: 5.5 or 5. or 5.5E10 or 5.E10 | "." (["0"-"9"])+ ()? // matches: .5 or .5E10 | (["0"-"9"])+ // matches: 5E10 @@ -143,7 +143,7 @@ BooleanExpression JmsSelector() : { ( left = orExpression() - ) + ) { return asBooleanExpression(left); } @@ -157,14 +157,14 @@ Expression orExpression() : } { ( - left = andExpression() - ( - right = andExpression() + left = andExpression() + ( + right = andExpression() { left = LogicExpression.createOR(asBooleanExpression(left), asBooleanExpression(right)); } )* - ) + ) { return left; } @@ -179,14 +179,14 @@ Expression andExpression() : } { ( - left = equalityExpression() - ( - right = equalityExpression() + left = equalityExpression() + ( + right = equalityExpression() { left = LogicExpression.createAND(asBooleanExpression(left), asBooleanExpression(right)); } )* - ) + ) { return left; } @@ -199,31 +199,31 @@ Expression equalityExpression() : } { ( - left = comparisonExpression() - ( - - "=" right = comparisonExpression() + left = comparisonExpression() + ( + + "=" right = comparisonExpression() { left = ComparisonExpression.createEqual(left, right); } - | - "<>" right = comparisonExpression() + | + "<>" right = comparisonExpression() { left = ComparisonExpression.createNotEqual(left, right); } - | + | LOOKAHEAD(2) { left = ComparisonExpression.createIsNull(left); } - | + | { left = ComparisonExpression.createIsNotNull(left); } )* - ) + ) { return left; } @@ -241,33 +241,33 @@ Expression comparisonExpression() : } { ( - left = addExpression() - ( - - ">" right = addExpression() + left = addExpression() + ( + + ">" right = addExpression() { left = ComparisonExpression.createGreaterThan(left, right); } - | - ">=" right = addExpression() + | + ">=" right = addExpression() { left = ComparisonExpression.createGreaterThanEqual(left, right); } - | - "<" right = addExpression() + | + "<" right = addExpression() { left = ComparisonExpression.createLessThan(left, right); } - | - "<=" right = addExpression() + | + "<=" right = addExpression() { left = ComparisonExpression.createLessThanEqual(left, right); } | { u=null; - } - t = stringLitteral() + } + t = stringLitteral() [ u = stringLitteral() ] { left = ComparisonExpression.createLike(left, t, u); @@ -276,7 +276,7 @@ Expression comparisonExpression() : LOOKAHEAD(2) { u=null; - } + } t = stringLitteral() [ u = stringLitteral() ] { left = ComparisonExpression.createNotLike(left, t, u); @@ -293,20 +293,20 @@ Expression comparisonExpression() : left = ComparisonExpression.createNotBetween(left, low, high); } | - - "(" + + "(" t = stringLitteral() { list = new ArrayList(); list.add( t ); } - ( + ( "," - t = stringLitteral() + t = stringLitteral() { list.add( t ); } - + )* ")" { @@ -314,28 +314,28 @@ Expression comparisonExpression() : } | LOOKAHEAD(2) - - "(" + + "(" t = stringLitteral() { list = new ArrayList(); list.add( t ); } - ( + ( "," - t = stringLitteral() + t = stringLitteral() { list.add( t ); } - + )* ")" { left = ComparisonExpression.createNotInFilter(left, list); } - + )* - ) + ) { return left; } @@ -347,21 +347,21 @@ Expression addExpression() : Expression right; } { - left = multExpr() - ( + left = multExpr() + ( LOOKAHEAD( ("+"|"-") multExpr()) ( - "+" right = multExpr() + "+" right = multExpr() { left = ArithmeticExpression.createPlus(left, right); } - | - "-" right = multExpr() + | + "-" right = multExpr() { left = ArithmeticExpression.createMinus(left, right); } ) - + )* { return left; @@ -374,23 +374,23 @@ Expression multExpr() : Expression right; } { - left = unaryExpr() - ( - "*" right = unaryExpr() + left = unaryExpr() + ( + "*" right = unaryExpr() { left = ArithmeticExpression.createMultiply(left, right); } - | - "/" right = unaryExpr() + | + "/" right = unaryExpr() { left = ArithmeticExpression.createDivide(left, right); } - | - "%" right = unaryExpr() + | + "%" right = unaryExpr() { left = ArithmeticExpression.createMod(left, right); } - + )* { return left; @@ -447,7 +447,7 @@ Expression primaryExpr() : left = variable() | "(" left = orExpression() ")" - ) + ) { return left; } @@ -468,55 +468,55 @@ ConstantExpression literal() : { left = new ConstantExpression(s); } - ) - | + ) + | ( t = { left = ConstantExpression.createFromDecimal(t.image); - } - ) - | + } + ) + | ( t = { left = ConstantExpression.createFromHex(t.image); - } - ) - | + } + ) + | ( t = { left = ConstantExpression.createFromOctal(t.image); - } - ) - | + } + ) + | ( t = { left = ConstantExpression.createFloat(t.image); - } - ) - | + } + ) + | ( { left = ConstantExpression.TRUE; - } - ) - | + } + ) + | ( { left = ConstantExpression.FALSE; - } - ) - | + } + ) + | ( { left = ConstantExpression.NULL; - } + } ) ) { @@ -531,18 +531,18 @@ String stringLitteral() : boolean first=true; } { - t = + t = { // Decode the sting value. String image = t.image; for( int i=1; i < image.length()-1; i++ ) { char c = image.charAt(i); if( c == '\'' ) - i++; + i++; rc.append(c); } return rc.toString(); - } + } } PropertyExpression variable() : diff --git a/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java similarity index 84% rename from activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java rename to artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java index e48b112182..d08c4141be 100755 --- a/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java +++ b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector; +package org.apache.activemq.artemis.selector; -import org.apache.activemq.selector.filter.BooleanExpression; -import org.apache.activemq.selector.filter.ComparisonExpression; -import org.apache.activemq.selector.filter.Expression; -import org.apache.activemq.selector.filter.LogicExpression; -import org.apache.activemq.selector.filter.PropertyExpression; -import org.apache.activemq.selector.filter.XPathExpression; -import org.apache.activemq.selector.impl.SelectorParser; +import org.apache.activemq.artemis.selector.filter.BooleanExpression; +import org.apache.activemq.artemis.selector.filter.ComparisonExpression; +import org.apache.activemq.artemis.selector.filter.Expression; +import org.apache.activemq.artemis.selector.filter.LogicExpression; +import org.apache.activemq.artemis.selector.filter.PropertyExpression; +import org.apache.activemq.artemis.selector.filter.XPathExpression; +import org.apache.activemq.artemis.selector.impl.SelectorParser; import org.junit.Assert; import org.junit.Test; diff --git a/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java similarity index 98% rename from activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java rename to artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java index 0e629de782..bc68f8142d 100755 --- a/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java +++ b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.selector; +package org.apache.activemq.artemis.selector; import java.util.HashMap; -import org.apache.activemq.selector.filter.BooleanExpression; -import org.apache.activemq.selector.filter.FilterException; -import org.apache.activemq.selector.filter.Filterable; -import org.apache.activemq.selector.impl.SelectorParser; +import org.apache.activemq.artemis.selector.filter.BooleanExpression; +import org.apache.activemq.artemis.selector.filter.FilterException; +import org.apache.activemq.artemis.selector.filter.Filterable; +import org.apache.activemq.artemis.selector.impl.SelectorParser; import org.junit.Assert; import org.junit.Test; diff --git a/activemq-server/pom.xml b/artemis-server/pom.xml similarity index 89% rename from activemq-server/pom.xml rename to artemis-server/pom.xml index a0bc3a4569..1ff6856469 100644 --- a/activemq-server/pom.xml +++ b/artemis-server/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-server + artemis-server jar ActiveMQ Artemis Server @@ -53,22 +53,22 @@ org.apache.activemq - activemq-commons + artemis-commons ${project.version} org.apache.activemq - activemq-journal + artemis-journal ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client test-jar ${project.version} test @@ -99,7 +99,7 @@ 512m false true - org.apache.activemq.core:org.apache.activemq.utils + org.apache.activemq.artemis.core:org.apache.activemq.artemis.utils diff --git a/activemq-server/src/main/java/org/apache/activemq/api/core/management/MessageCounterInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/api/core/management/MessageCounterInfo.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java index a0dffaab6e..955f3a2c22 100644 --- a/activemq-server/src/main/java/org/apache/activemq/api/core/management/MessageCounterInfo.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.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.management; +package org.apache.activemq.artemis.api.core.management; import java.text.DateFormat; import java.util.Date; -import org.apache.activemq.core.messagecounter.MessageCounter; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.core.messagecounter.MessageCounter; +import org.apache.activemq.artemis.utils.json.JSONObject; /** * Helper class to create Java Objects from the diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/BackupStrategy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BackupStrategy.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/config/BackupStrategy.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BackupStrategy.java index 194b22ba99..1a3740ea95 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/BackupStrategy.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BackupStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config; +package org.apache.activemq.artemis.core.config; public enum BackupStrategy diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java index 65cb2a4866..c4686acd66 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config; +package org.apache.activemq.artemis.core.config; import java.io.Serializable; import java.util.List; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; public final class BridgeConfiguration implements Serializable { @@ -56,8 +56,6 @@ public final class BridgeConfiguration implements Serializable private int confirmationWindowSize = ActiveMQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE; - private int producerWindowSize = ActiveMQDefaultConfiguration.getDefaultBridgeProducerWindowSize(); - private long clientFailureCheckPeriod = ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; private String user = ActiveMQDefaultConfiguration.getDefaultClusterUser(); @@ -304,19 +302,6 @@ public final class BridgeConfiguration implements Serializable return this; } - /** The producer flow control on the birdge */ - public BridgeConfiguration setProducerWindowSize(final int producerWindowSize) - { - this.producerWindowSize = producerWindowSize; - return this; - } - - public int getProducerWindowSize() - { - return producerWindowSize; - - } - public long getClientFailureCheckPeriod() { return clientFailureCheckPeriod; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java index ea95dd8f86..bbc3fe7f3d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config; +package org.apache.activemq.artemis.core.config; import java.io.Serializable; import java.util.Collections; import java.util.List; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; public final class ClusterConnectionConfiguration implements Serializable { @@ -63,8 +63,6 @@ public final class ClusterConnectionConfiguration implements Serializable private int confirmationWindowSize = ActiveMQDefaultConfiguration.getDefaultClusterConfirmationWindowSize(); - private int producerWindowSize = ActiveMQDefaultConfiguration.getDefaultBridgeProducerWindowSize(); - private boolean allowDirectConnectionsOnly = false; private int minLargeMessageSize = ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; @@ -200,18 +198,6 @@ public final class ClusterConnectionConfiguration implements Serializable return this; } - - public int getProducerWindowSize() - { - return producerWindowSize; - } - - public ClusterConnectionConfiguration setProducerindowSize(int producerWindowSize) - { - this.producerWindowSize = producerWindowSize; - return this; - } - public List getStaticConnectors() { return staticConnectors; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java similarity index 76% rename from activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java index 4f80a300f8..80298d1a9b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config; +package org.apache.activemq.artemis.core.config; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq.api.core.BroadcastGroupConfiguration; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration; -import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; /** * A Configuration is used to configure ActiveMQ servers. @@ -53,7 +53,7 @@ public interface Configuration /** * Returns whether delivery count is persisted before messages are delivered to the consumers.
* Default value is - * {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}. + * {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}. */ boolean isPersistDeliveryCountBeforeDelivery(); @@ -64,7 +64,7 @@ public interface Configuration /** * Returns whether this server is using persistence and store data.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}. */ boolean isPersistenceEnabled(); @@ -75,7 +75,7 @@ public interface Configuration /** * Returns the period (in milliseconds) to scan configuration files used by deployment.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}. */ long getFileDeployerScanPeriod(); @@ -86,7 +86,7 @@ public interface Configuration /** * Returns the maximum number of threads in the thread pool of this server.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_THREAD_POOL_MAX_SIZE}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_THREAD_POOL_MAX_SIZE}. */ int getThreadPoolMaxSize(); @@ -97,7 +97,7 @@ public interface Configuration /** * Returns the maximum number of threads in the scheduled thread pool of this server.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. */ int getScheduledThreadPoolMaxSize(); @@ -108,7 +108,7 @@ public interface Configuration /** * Returns the interval time (in milliseconds) to invalidate security credentials.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_INVALIDATION_INTERVAL}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_INVALIDATION_INTERVAL}. */ long getSecurityInvalidationInterval(); @@ -119,7 +119,7 @@ public interface Configuration /** * Returns whether security is enabled for this server.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}. */ boolean isSecurityEnabled(); @@ -130,7 +130,7 @@ public interface Configuration /** * Returns whether graceful shutdown is enabled for this server.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}. */ boolean isGracefulShutdownEnabled(); @@ -141,7 +141,7 @@ public interface Configuration /** * Returns the graceful shutdown timeout for this server.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_GRACEFUL_SHUTDOWN_TIMEOUT}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_GRACEFUL_SHUTDOWN_TIMEOUT}. */ long getGracefulShutdownTimeout(); @@ -152,19 +152,19 @@ public interface Configuration /** * Returns whether this server is manageable using JMX or not.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. */ boolean isJMXManagementEnabled(); /** * Sets whether this server is manageable using JMX or not.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. */ Configuration setJMXManagementEnabled(boolean enabled); /** * Returns the domain used by JMX MBeans (provided JMX management is enabled).
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_DOMAIN}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_DOMAIN}. */ String getJMXDomain(); @@ -192,7 +192,7 @@ public interface Configuration * Sets the list of interceptors classes used by this server for incoming messages (i.e. those being delivered to * the server from clients). *
- * Classes must implement {@link org.apache.activemq.api.core.Interceptor}. + * Classes must implement {@link org.apache.activemq.artemis.api.core.Interceptor}. */ Configuration setIncomingInterceptorClassNames(List interceptors); @@ -200,14 +200,14 @@ public interface Configuration * Sets the list of interceptors classes used by this server for outgoing messages (i.e. those being delivered to * clients from the server). *
- * Classes must implement {@link org.apache.activemq.api.core.Interceptor}. + * Classes must implement {@link org.apache.activemq.artemis.api.core.Interceptor}. */ Configuration setOutgoingInterceptorClassNames(List interceptors); /** * Returns the connection time to live.
* This value overrides the connection time to live sent by the client.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}. */ long getConnectionTTLOverride(); @@ -219,7 +219,7 @@ public interface Configuration /** * Returns whether code coming from connection is executed asynchronously or not.
* Default value is - * {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}. + * {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}. */ boolean isAsyncConnectionExecutionEnabled(); @@ -340,7 +340,7 @@ public interface Configuration /** * Returns the management address of this server.
* Clients can send management messages to this address to manage this server.
- * Default value is {@link org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}. + * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}. */ SimpleString getManagementAddress(); @@ -353,7 +353,7 @@ public interface Configuration * Returns the management notification address of this server.
* Clients can bind queues to this address to receive management notifications emitted by this * server.
- * Default value is {@link org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS}. + * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS}. */ SimpleString getManagementNotificationAddress(); @@ -364,7 +364,7 @@ public interface Configuration /** * Returns the cluster user for this server.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_USER}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_USER}. */ String getClusterUser(); @@ -375,7 +375,7 @@ public interface Configuration /** * Returns the cluster password for this server.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}. */ String getClusterPassword(); @@ -386,7 +386,7 @@ public interface Configuration /** * Returns the size of the cache for pre-creating message IDs.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}. */ int getIDCacheSize(); @@ -397,7 +397,7 @@ public interface Configuration /** * Returns whether message ID cache is persisted.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}. */ boolean isPersistIDCache(); @@ -410,7 +410,7 @@ public interface Configuration /** * Returns the file system directory used to store bindings.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}. */ String getBindingsDirectory(); @@ -422,7 +422,7 @@ public interface Configuration /** * The max number of concurrent reads allowed on paging. *

- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}. */ int getPageMaxConcurrentIO(); @@ -435,7 +435,7 @@ public interface Configuration /** * Returns the file system directory used to store journal log.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_DIR}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_DIR}. */ String getJournalDirectory(); @@ -458,7 +458,7 @@ public interface Configuration /** * Returns whether the journal is synchronized when receiving transactional data.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}. */ boolean isJournalSyncTransactional(); @@ -469,7 +469,7 @@ public interface Configuration /** * Returns whether the journal is synchronized when receiving non-transactional data.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}. */ boolean isJournalSyncNonTransactional(); @@ -480,7 +480,7 @@ public interface Configuration /** * Returns the size (in bytes) of each journal files.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}. */ int getJournalFileSize(); @@ -491,7 +491,7 @@ public interface Configuration /** * Returns the minimal number of journal files before compacting.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}. */ int getJournalCompactMinFiles(); @@ -502,7 +502,7 @@ public interface Configuration /** * Returns the percentage of live data before compacting the journal.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}. */ int getJournalCompactPercentage(); @@ -513,7 +513,7 @@ public interface Configuration /** * Returns the number of journal files to pre-create.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}. */ int getJournalMinFiles(); @@ -526,7 +526,7 @@ public interface Configuration /** * Returns the maximum number of write requests that can be in the AIO queue at any given time.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}. */ int getJournalMaxIO_AIO(); @@ -538,7 +538,7 @@ public interface Configuration /** * Returns the timeout (in nanoseconds) used to flush buffers in the AIO queue. *
- * Default value is {@value org.apache.activemq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO}. + * Default value is {@value org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO}. */ int getJournalBufferTimeout_AIO(); @@ -550,7 +550,7 @@ public interface Configuration /** * Returns the buffer size (in bytes) for AIO. *
- * Default value is {@value org.apache.activemq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_AIO}. + * Default value is {@value org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_AIO}. */ int getJournalBufferSize_AIO(); @@ -561,7 +561,7 @@ public interface Configuration /** * Returns the maximum number of write requests for NIO journal.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}. */ int getJournalMaxIO_NIO(); @@ -573,7 +573,7 @@ public interface Configuration /** * Returns the timeout (in nanoseconds) used to flush buffers in the NIO. *
- * Default value is {@value org.apache.activemq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO}. + * Default value is {@value org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO}. */ int getJournalBufferTimeout_NIO(); @@ -585,7 +585,7 @@ public interface Configuration /** * Returns the buffer size (in bytes) for NIO. *
- * Default value is {@value org.apache.activemq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_NIO}. + * Default value is {@value org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_NIO}. */ int getJournalBufferSize_NIO(); @@ -596,7 +596,7 @@ public interface Configuration /** * Returns whether the bindings directory is created on this server startup.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}. */ boolean isCreateBindingsDir(); @@ -607,7 +607,7 @@ public interface Configuration /** * Returns whether the journal directory is created on this server startup.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}. */ boolean isCreateJournalDir(); @@ -646,7 +646,7 @@ public interface Configuration /** * Returns the file system directory used to store paging files.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PAGING_DIR}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_PAGING_DIR}. */ String getPagingDirectory(); @@ -659,7 +659,7 @@ public interface Configuration /** * Returns the file system directory used to store large messages.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}. */ String getLargeMessagesDirectory(); @@ -672,7 +672,7 @@ public interface Configuration /** * Returns whether wildcard routing is supported by this server.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}. */ boolean isWildcardRoutingEnabled(); @@ -684,7 +684,7 @@ public interface Configuration /** * Returns the timeout (in milliseconds) after which transactions is removed from the resource * manager after it was created.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}. */ long getTransactionTimeout(); @@ -696,7 +696,7 @@ public interface Configuration /** * Returns whether message counter is enabled for this server.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}. */ boolean isMessageCounterEnabled(); @@ -707,7 +707,7 @@ public interface Configuration /** * Returns the sample period (in milliseconds) to take message counter snapshot.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}. */ long getMessageCounterSamplePeriod(); @@ -720,7 +720,7 @@ public interface Configuration /** * Returns the maximum number of days kept in memory for message counter.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}. */ int getMessageCounterMaxDayHistory(); @@ -734,7 +734,7 @@ public interface Configuration /** * Returns the frequency (in milliseconds) to scan transactions to detect which transactions have * timed out.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}. */ long getTransactionTimeoutScanPeriod(); @@ -747,7 +747,7 @@ public interface Configuration /** * Returns the frequency (in milliseconds) to scan messages to detect which messages have * expired.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}. */ long getMessageExpiryScanPeriod(); @@ -759,7 +759,7 @@ public interface Configuration /** * Returns the priority of the thread used to scan message expiration.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}. + * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}. */ int getMessageExpiryThreadPriority(); @@ -829,7 +829,7 @@ public interface Configuration /* * @see #setResolveProtocols() * @return whether ActiveMQ should resolve and use any Protocols available on the classpath - * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_RESOLVE_PROTOCOLS}. + * Default value is {@value org.apache.activemq.artemis.api.config.org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_RESOLVE_PROTOCOLS}. * */ boolean isResolveProtocols(); diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java similarity index 79% rename from activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java index e66a7b62ea..77852b92ab 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config; +package org.apache.activemq.artemis.core.config; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.core.config.ha.ColocatedPolicyConfiguration; -import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; -import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; -import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; -import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.cluster.ha.BackupPolicy; -import org.apache.activemq.core.server.cluster.ha.ColocatedPolicy; -import org.apache.activemq.core.server.cluster.ha.HAPolicy; -import org.apache.activemq.core.server.cluster.ha.LiveOnlyPolicy; -import org.apache.activemq.core.server.cluster.ha.ReplicaPolicy; -import org.apache.activemq.core.server.cluster.ha.ReplicatedPolicy; -import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy; -import org.apache.activemq.core.server.cluster.ha.SharedStoreMasterPolicy; -import org.apache.activemq.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.core.config.ha.ColocatedPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.cluster.ha.BackupPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.ColocatedPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.HAPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.LiveOnlyPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.ReplicaPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreMasterPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreSlavePolicy; public final class ConfigurationUtils { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConnectorServiceConfiguration.java similarity index 98% rename from activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConnectorServiceConfiguration.java index a6f7a7e48d..d175dffde9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConnectorServiceConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config; +package org.apache.activemq.artemis.core.config; import java.io.Serializable; import java.util.Map; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java similarity index 98% rename from activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java index be221d36c5..b85386a80b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config; +package org.apache.activemq.artemis.core.config; import java.io.Serializable; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java index 1aedfa7567..7e3b26dbc9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config; +package org.apache.activemq.artemis.core.config; import java.io.Serializable; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.utils.UUIDGenerator; public class DivertConfiguration implements Serializable { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/FileDeploymentManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/config/FileDeploymentManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java index 8e8f901a62..77fa4fe4e6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/FileDeploymentManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config; +package org.apache.activemq.artemis.core.config; import javax.management.MBeanServer; import java.io.InputStreamReader; @@ -24,10 +24,10 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.activemq.core.deployers.Deployable; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.utils.XMLUtil; +import org.apache.activemq.artemis.core.deployers.Deployable; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.utils.XMLUtil; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -75,10 +75,10 @@ public class FileDeploymentManager } // create a reader Reader reader = new InputStreamReader(url.openStream()); - String xml = org.apache.activemq.utils.XMLUtil.readerToString(reader); + String xml = XMLUtil.readerToString(reader); //replace any system props xml = XMLUtil.replaceSystemProps(xml); - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(xml); + Element e = XMLUtil.stringToElement(xml); //iterate around all the deployables for (Deployable deployable : deployables.values()) diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/HAPolicyConfiguration.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/HAPolicyConfiguration.java index 00dd8ba946..af9fc5261f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/HAPolicyConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config; +package org.apache.activemq.artemis.core.config; import java.io.Serializable; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ScaleDownConfiguration.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ScaleDownConfiguration.java index 61302d6667..30df2a2706 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ScaleDownConfiguration.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config; +package org.apache.activemq.artemis.core.config; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import java.io.Serializable; import java.util.ArrayList; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ColocatedPolicyConfiguration.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ColocatedPolicyConfiguration.java index fa6bb89967..2d7fd53cfd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ColocatedPolicyConfiguration.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.ha; +package org.apache.activemq.artemis.core.config.ha; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.config.HAPolicyConfiguration; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.config.HAPolicyConfiguration; import java.util.ArrayList; import java.util.List; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/LiveOnlyPolicyConfiguration.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/LiveOnlyPolicyConfiguration.java index 0d3974d0f0..2a013e1ea1 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/LiveOnlyPolicyConfiguration.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.ha; +package org.apache.activemq.artemis.core.config.ha; -import org.apache.activemq.core.config.HAPolicyConfiguration; -import org.apache.activemq.core.config.ScaleDownConfiguration; +import org.apache.activemq.artemis.core.config.HAPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ScaleDownConfiguration; public class LiveOnlyPolicyConfiguration implements HAPolicyConfiguration { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ReplicaPolicyConfiguration.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ReplicaPolicyConfiguration.java index 9cb4c1f80f..1c8dbfe217 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ReplicaPolicyConfiguration.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.ha; +package org.apache.activemq.artemis.core.config.ha; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.config.HAPolicyConfiguration; -import org.apache.activemq.core.config.ScaleDownConfiguration; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.config.HAPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ScaleDownConfiguration; public class ReplicaPolicyConfiguration implements HAPolicyConfiguration { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ReplicatedPolicyConfiguration.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ReplicatedPolicyConfiguration.java index 29188d3ffd..4892903944 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ReplicatedPolicyConfiguration.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.ha; +package org.apache.activemq.artemis.core.config.ha; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.config.HAPolicyConfiguration; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.config.HAPolicyConfiguration; public class ReplicatedPolicyConfiguration implements HAPolicyConfiguration { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/SharedStoreMasterPolicyConfiguration.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/SharedStoreMasterPolicyConfiguration.java index 9d6a41efb2..2c43e23098 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/SharedStoreMasterPolicyConfiguration.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.ha; +package org.apache.activemq.artemis.core.config.ha; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.config.HAPolicyConfiguration; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.config.HAPolicyConfiguration; public class SharedStoreMasterPolicyConfiguration implements HAPolicyConfiguration { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/SharedStoreSlavePolicyConfiguration.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/SharedStoreSlavePolicyConfiguration.java index 26cfbf0c44..89caa2d541 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/SharedStoreSlavePolicyConfiguration.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.ha; +package org.apache.activemq.artemis.core.config.ha; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.config.HAPolicyConfiguration; -import org.apache.activemq.core.config.ScaleDownConfiguration; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.config.HAPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ScaleDownConfiguration; public class SharedStoreSlavePolicyConfiguration implements HAPolicyConfiguration { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java similarity index 97% rename from activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java index c103896a81..eef60282db 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; +package org.apache.activemq.artemis.core.config.impl; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -29,24 +29,24 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.api.core.BroadcastGroupConfiguration; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.config.BridgeConfiguration; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.ConnectorServiceConfiguration; -import org.apache.activemq.core.config.CoreQueueConfiguration; -import org.apache.activemq.core.config.DivertConfiguration; -import org.apache.activemq.core.config.HAPolicyConfiguration; -import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; -import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration; -import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.config.BridgeConfiguration; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration; +import org.apache.activemq.artemis.core.config.CoreQueueConfiguration; +import org.apache.activemq.artemis.core.config.DivertConfiguration; +import org.apache.activemq.artemis.core.config.HAPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; public class ConfigurationImpl implements Configuration, Serializable { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java index 8142c5635e..a3aa9ba56c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; +package org.apache.activemq.artemis.core.config.impl; import java.util.Map; -import org.apache.activemq.core.deployers.Deployable; -import org.apache.activemq.core.deployers.impl.FileConfigurationParser; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.core.deployers.Deployable; +import org.apache.activemq.artemis.core.deployers.impl.FileConfigurationParser; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; import org.w3c.dom.Element; import javax.management.MBeanServer; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileSecurityConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileSecurityConfiguration.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileSecurityConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileSecurityConfiguration.java index aa4e92d99d..a46f7ba934 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileSecurityConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileSecurityConfiguration.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; +package org.apache.activemq.artemis.core.config.impl; -import org.apache.activemq.utils.PasswordMaskingUtil; -import org.apache.activemq.utils.SensitiveDataCodec; +import org.apache.activemq.artemis.utils.PasswordMaskingUtil; +import org.apache.activemq.artemis.utils.SensitiveDataCodec; import java.net.URL; import java.util.Properties; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/SecurityConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/SecurityConfiguration.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/config/impl/SecurityConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/SecurityConfiguration.java index 45566e1ed9..9150698676 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/SecurityConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/SecurityConfiguration.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; +package org.apache.activemq.artemis.core.config.impl; -import org.apache.activemq.core.security.User; -import org.apache.activemq.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.security.User; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; import java.util.ArrayList; import java.util.HashMap; @@ -111,7 +111,7 @@ public class SecurityConfiguration return defaultUser; } - public org.apache.activemq.core.security.User getUser(String username) + public org.apache.activemq.artemis.core.security.User getUser(String username) { return users.get(username); } diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java index a2af5e7e07..43cecf2e1b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/Validators.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; +package org.apache.activemq.artemis.core.config.impl; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy; /** * A Validators. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployable.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployable.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java index 282bda43f5..96ab8760e9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployable.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.deployers; +package org.apache.activemq.artemis.core.deployers; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; import org.w3c.dom.Element; import javax.management.MBeanServer; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java index 3f7c637531..c64bee2ffc 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.deployers.impl; +package org.apache.activemq.artemis.core.deployers.impl; import java.io.InputStream; import java.io.InputStreamReader; @@ -26,47 +26,47 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.api.core.BroadcastEndpointFactory; -import org.apache.activemq.api.core.BroadcastGroupConfiguration; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.JGroupsFileBroadcastEndpointFactory; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.UDPBroadcastEndpointFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.core.config.BridgeConfiguration; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.ConnectorServiceConfiguration; -import org.apache.activemq.core.config.CoreQueueConfiguration; -import org.apache.activemq.core.config.DivertConfiguration; -import org.apache.activemq.core.config.ScaleDownConfiguration; -import org.apache.activemq.core.config.ha.ColocatedPolicyConfiguration; -import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; -import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; -import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; -import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.config.impl.Validators; -import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; -import org.apache.activemq.core.journal.impl.JournalConstants; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration; -import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; -import org.apache.activemq.uri.AcceptorTransportConfigurationParser; -import org.apache.activemq.uri.ConnectorTransportConfigurationParser; -import org.apache.activemq.utils.DefaultSensitiveStringCodec; -import org.apache.activemq.utils.PasswordMaskingUtil; -import org.apache.activemq.utils.SensitiveDataCodec; -import org.apache.activemq.utils.XMLConfigurationUtil; -import org.apache.activemq.utils.XMLUtil; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.JGroupsFileBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.core.config.BridgeConfiguration; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration; +import org.apache.activemq.artemis.core.config.CoreQueueConfiguration; +import org.apache.activemq.artemis.core.config.DivertConfiguration; +import org.apache.activemq.artemis.core.config.ScaleDownConfiguration; +import org.apache.activemq.artemis.core.config.ha.ColocatedPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.config.impl.Validators; +import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.JournalConstants; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.artemis.uri.AcceptorTransportConfigurationParser; +import org.apache.activemq.artemis.uri.ConnectorTransportConfigurationParser; +import org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec; +import org.apache.activemq.artemis.utils.PasswordMaskingUtil; +import org.apache.activemq.artemis.utils.SensitiveDataCodec; +import org.apache.activemq.artemis.utils.XMLConfigurationUtil; +import org.apache.activemq.artemis.utils.XMLUtil; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; @@ -171,9 +171,9 @@ public final class FileConfigurationParser extends XMLConfigurationUtil { Reader reader = new InputStreamReader(input); - String xml = org.apache.activemq.utils.XMLUtil.readerToString(reader); + String xml = XMLUtil.readerToString(reader); xml = XMLUtil.replaceSystemProps(xml); - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(xml); + Element e = XMLUtil.stringToElement(xml); Configuration config = new ConfigurationImpl(); @@ -1417,10 +1417,6 @@ public final class FileConfigurationParser extends XMLConfigurationUtil getInteger(e, "confirmation-window-size", ActiveMQDefaultConfiguration.getDefaultClusterConfirmationWindowSize(), Validators.GT_ZERO); - int producerWindowSize = - getInteger(e, "producer-window-size", ActiveMQDefaultConfiguration.getDefaultBridgeConfirmationWindowSize(), - Validators.MINUS_ONE_OR_GT_ZERO); - long clusterNotificationInterval = getLong(e, "notification-interval", ActiveMQDefaultConfiguration.getDefaultClusterNotificationInterval(), Validators.GT_ZERO); int clusterNotificationAttempts = getInteger(e, "notification-attempts", ActiveMQDefaultConfiguration.getDefaultClusterNotificationAttempts(), Validators.GT_ZERO); @@ -1472,7 +1468,6 @@ public final class FileConfigurationParser extends XMLConfigurationUtil .setForwardWhenNoConsumers(forwardWhenNoConsumers) .setMaxHops(maxHops) .setConfirmationWindowSize(confirmationWindowSize) - .setProducerindowSize(producerWindowSize) .setAllowDirectConnectionsOnly(allowDirectConnectionsOnly) .setClusterNotificationInterval(clusterNotificationInterval) .setClusterNotificationAttempts(clusterNotificationAttempts); @@ -1554,10 +1549,6 @@ public final class FileConfigurationParser extends XMLConfigurationUtil getInteger(brNode, "reconnect-attempts-same-node", ActiveMQDefaultConfiguration.getDefaultBridgeConnectSameNode(), Validators.MINUS_ONE_OR_GE_ZERO); - int producerWindowSize = - getInteger(brNode, "producer-window-size", ActiveMQDefaultConfiguration.getDefaultBridgeProducerWindowSize(), - Validators.MINUS_ONE_OR_GE_ZERO); - boolean useDuplicateDetection = getBoolean(brNode, "use-duplicate-detection", ActiveMQDefaultConfiguration.isDefaultBridgeDuplicateDetection()); @@ -1639,8 +1630,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil .setConfirmationWindowSize(confirmationWindowSize) .setHA(ha) .setUser(user) - .setPassword(password) - .setProducerWindowSize(producerWindowSize); + .setPassword(password); if (!staticConnectorNames.isEmpty()) { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/filter/Filter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/Filter.java similarity index 84% rename from activemq-server/src/main/java/org/apache/activemq/core/filter/Filter.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/Filter.java index 1a93575b88..08330b3aaf 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/filter/Filter.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/Filter.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.filter; +package org.apache.activemq.artemis.core.filter; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.ServerMessage; public interface Filter { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java similarity index 87% rename from activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java index dd03532b8d..ccd0ee3971 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.filter.impl; +package org.apache.activemq.artemis.core.filter.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.selector.filter.BooleanExpression; -import org.apache.activemq.selector.filter.FilterException; -import org.apache.activemq.selector.filter.Filterable; -import org.apache.activemq.selector.impl.SelectorParser; -import org.apache.activemq.api.core.FilterConstants; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.selector.filter.BooleanExpression; +import org.apache.activemq.artemis.selector.filter.FilterException; +import org.apache.activemq.artemis.selector.filter.Filterable; +import org.apache.activemq.artemis.selector.impl.SelectorParser; +import org.apache.activemq.artemis.api.core.FilterConstants; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ServerMessage; /** * This class implements a ActiveMQ filter @@ -59,7 +59,7 @@ public class FilterImpl implements Filter /** * @return null if filterStr is null or an empty String and a valid filter else - * @throws org.apache.activemq.api.core.ActiveMQException if the string does not correspond to a valid filter + * @throws ActiveMQException if the string does not correspond to a valid filter */ public static Filter createFilter(final String filterStr) throws ActiveMQException { @@ -68,7 +68,7 @@ public class FilterImpl implements Filter /** * @return null if filterStr is null or an empty String and a valid filter else - * @throws org.apache.activemq.api.core.ActiveMQException if the string does not correspond to a valid filter + * @throws ActiveMQException if the string does not correspond to a valid filter */ public static Filter createFilter(final SimpleString filterStr) throws ActiveMQException { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AbstractControl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/management/impl/AbstractControl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java index dad97035c6..753dd971f4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AbstractControl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.management.impl; +package org.apache.activemq.artemis.core.management.impl; import javax.management.MBeanInfo; import javax.management.MBeanOperationInfo; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; -import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.persistence.StorageManager; public abstract class AbstractControl extends StandardMBean { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AcceptorControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/management/impl/AcceptorControlImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java index 828ad73b38..0431ed144c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AcceptorControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.management.impl; +package org.apache.activemq.artemis.core.management.impl; import java.util.Map; import javax.management.MBeanOperationInfo; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.management.AcceptorControl; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.management.AcceptorControl; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; public class AcceptorControlImpl extends AbstractControl implements AcceptorControl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/management/impl/ActiveMQServerControlImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java index bd9d742d4f..52762248d0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/ActiveMQServerControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.management.impl; +package org.apache.activemq.artemis.core.management.impl; import java.text.DateFormat; import java.util.ArrayList; @@ -40,58 +40,58 @@ import javax.management.NotificationFilter; import javax.management.NotificationListener; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.management.AddressControl; -import org.apache.activemq.api.core.management.BridgeControl; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.DivertControl; -import org.apache.activemq.api.core.management.ActiveMQServerControl; -import org.apache.activemq.api.core.management.QueueControl; -import org.apache.activemq.core.config.BridgeConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.DivertConfiguration; -import org.apache.activemq.core.messagecounter.MessageCounterManager; -import org.apache.activemq.core.messagecounter.impl.MessageCounterManagerImpl; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.persistence.config.PersistedAddressSetting; -import org.apache.activemq.core.persistence.config.PersistedRoles; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.DuplicateIDCache; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.security.CheckType; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.Consumer; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerConsumer; -import org.apache.activemq.core.server.ServerSession; -import org.apache.activemq.core.server.cluster.ha.HAPolicy; -import org.apache.activemq.core.server.cluster.ha.LiveOnlyPolicy; -import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy; -import org.apache.activemq.core.server.cluster.ha.SharedStoreSlavePolicy; -import org.apache.activemq.core.server.group.GroupingHandler; -import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionDetail; -import org.apache.activemq.core.transaction.impl.CoreTransactionDetail; -import org.apache.activemq.core.transaction.impl.XidImpl; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.utils.SecurityFormatter; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.management.AddressControl; +import org.apache.activemq.artemis.api.core.management.BridgeControl; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.DivertControl; +import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl; +import org.apache.activemq.artemis.api.core.management.QueueControl; +import org.apache.activemq.artemis.core.config.BridgeConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.DivertConfiguration; +import org.apache.activemq.artemis.core.messagecounter.MessageCounterManager; +import org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterManagerImpl; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq.artemis.core.persistence.config.PersistedRoles; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.security.CheckType; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.Consumer; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerConsumer; +import org.apache.activemq.artemis.core.server.ServerSession; +import org.apache.activemq.artemis.core.server.cluster.ha.HAPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.LiveOnlyPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq.artemis.core.server.group.GroupingHandler; +import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionDetail; +import org.apache.activemq.artemis.core.transaction.impl.CoreTransactionDetail; +import org.apache.activemq.artemis.core.transaction.impl.XidImpl; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.utils.SecurityFormatter; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; public class ActiveMQServerControlImpl extends AbstractControl implements ActiveMQServerControl, NotificationEmitter, - org.apache.activemq.core.server.management.NotificationListener + org.apache.activemq.artemis.core.server.management.NotificationListener { // Constants ----------------------------------------------------- @@ -1413,7 +1413,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active /* (non-Javadoc) - * @see org.apache.activemq.api.core.management.ActiveMQServerControl#listProducersInfoAsJSON() + * @see org.apache.activemq.artemis.api.core.management.ActiveMQServerControl#listProducersInfoAsJSON() */ public String listProducersInfoAsJSON() throws Exception { @@ -2178,7 +2178,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active } @Override - public void onNotification(org.apache.activemq.core.server.management.Notification notification) + public void onNotification(org.apache.activemq.artemis.core.server.management.Notification notification) { if (!(notification.getType() instanceof CoreNotificationType)) return; CoreNotificationType type = (CoreNotificationType) notification.getType(); diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AddressControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/management/impl/AddressControlImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java index 4c77e4ce3b..e784284967 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AddressControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java @@ -14,27 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.management.impl; +package org.apache.activemq.artemis.core.management.impl; import javax.management.MBeanOperationInfo; import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.management.AddressControl; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.QueueBinding; -import org.apache.activemq.core.security.CheckType; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.AddressControl; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.Bindings; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.QueueBinding; +import org.apache.activemq.artemis.core.security.CheckType; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; public class AddressControlImpl extends AbstractControl implements AddressControl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BridgeControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/management/impl/BridgeControlImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java index a681aabd3e..de3e659e41 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BridgeControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.management.impl; +package org.apache.activemq.artemis.core.management.impl; import javax.management.MBeanOperationInfo; -import org.apache.activemq.api.core.management.BridgeControl; -import org.apache.activemq.core.config.BridgeConfiguration; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.cluster.Bridge; +import org.apache.activemq.artemis.api.core.management.BridgeControl; +import org.apache.activemq.artemis.core.config.BridgeConfiguration; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.cluster.Bridge; public class BridgeControlImpl extends AbstractControl implements BridgeControl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/management/impl/BroadcastGroupControlImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java index 5ed19a22ed..b4d6346e5b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BroadcastGroupControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.management.impl; +package org.apache.activemq.artemis.core.management.impl; import javax.management.MBeanOperationInfo; -import org.apache.activemq.api.core.BroadcastGroupConfiguration; -import org.apache.activemq.api.core.UDPBroadcastEndpointFactory; -import org.apache.activemq.api.core.management.BroadcastGroupControl; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.cluster.BroadcastGroup; -import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.management.BroadcastGroupControl; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.cluster.BroadcastGroup; +import org.apache.activemq.artemis.utils.json.JSONArray; public class BroadcastGroupControlImpl extends AbstractControl implements BroadcastGroupControl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/ClusterConnectionControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/management/impl/ClusterConnectionControlImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java index 4d31271b33..ea6b98c31a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/ClusterConnectionControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.management.impl; +package org.apache.activemq.artemis.core.management.impl; import javax.management.MBeanOperationInfo; import java.util.List; import java.util.Map; -import org.apache.activemq.api.core.management.ClusterConnectionControl; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.artemis.api.core.management.ClusterConnectionControl; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.utils.json.JSONArray; public class ClusterConnectionControlImpl extends AbstractControl implements ClusterConnectionControl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/DivertControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/management/impl/DivertControlImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java index 09afcc0c93..487aef39e2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/DivertControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.management.impl; +package org.apache.activemq.artemis.core.management.impl; import javax.management.MBeanOperationInfo; -import org.apache.activemq.api.core.management.DivertControl; -import org.apache.activemq.core.config.DivertConfiguration; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.Divert; +import org.apache.activemq.artemis.api.core.management.DivertControl; +import org.apache.activemq.artemis.core.config.DivertConfiguration; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.Divert; public class DivertControlImpl extends AbstractControl implements DivertControl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/MBeanInfoHelper.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/management/impl/MBeanInfoHelper.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java index f90ae260a6..3c4a256088 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/MBeanInfoHelper.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.management.impl; +package org.apache.activemq.artemis.core.management.impl; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -24,8 +24,8 @@ import java.util.List; import javax.management.MBeanOperationInfo; import javax.management.MBeanParameterInfo; -import org.apache.activemq.api.core.management.Operation; -import org.apache.activemq.api.core.management.Parameter; +import org.apache.activemq.artemis.api.core.management.Operation; +import org.apache.activemq.artemis.api.core.management.Parameter; public class MBeanInfoHelper { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java index f5e719b86b..e23dcc27f0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.management.impl; +package org.apache.activemq.artemis.core.management.impl; import javax.management.MBeanOperationInfo; import java.util.ArrayList; @@ -24,29 +24,29 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -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.api.core.management.MessageCounterInfo; -import org.apache.activemq.api.core.management.QueueControl; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.filter.impl.FilterImpl; -import org.apache.activemq.core.messagecounter.MessageCounter; -import org.apache.activemq.core.messagecounter.impl.MessageCounterHelper; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.server.Consumer; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerConsumer; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.utils.LinkedListIterator; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONException; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.MessageCounterInfo; +import org.apache.activemq.artemis.api.core.management.QueueControl; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.filter.impl.FilterImpl; +import org.apache.activemq.artemis.core.messagecounter.MessageCounter; +import org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterHelper; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.Consumer; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerConsumer; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.utils.LinkedListIterator; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONException; +import org.apache.activemq.artemis.utils.json.JSONObject; public class QueueControlImpl extends AbstractControl implements QueueControl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java similarity index 99% rename from activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounter.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java index 7005fc4d1c..09f5bc8ea7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounter.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.messagecounter; +package org.apache.activemq.artemis.core.messagecounter; import java.text.DateFormat; import java.util.ArrayList; @@ -22,7 +22,7 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.List; -import org.apache.activemq.core.server.Queue; +import org.apache.activemq.artemis.core.server.Queue; /** * This class stores message count informations for a given queue diff --git a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounterManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounterManager.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounterManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounterManager.java index 7cef93841d..612993b6e4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounterManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounterManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.messagecounter; +package org.apache.activemq.artemis.core.messagecounter; public interface MessageCounterManager { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterHelper.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterHelper.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java index c40d1d3737..52df4e16b6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterHelper.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.messagecounter.impl; +package org.apache.activemq.artemis.core.messagecounter.impl; import java.text.DateFormat; import java.util.Date; @@ -22,9 +22,9 @@ import java.util.GregorianCalendar; import java.util.List; import java.util.StringTokenizer; -import org.apache.activemq.api.core.management.DayCounterInfo; -import org.apache.activemq.core.messagecounter.MessageCounter; -import org.apache.activemq.core.messagecounter.MessageCounter.DayCounter; +import org.apache.activemq.artemis.api.core.management.DayCounterInfo; +import org.apache.activemq.artemis.core.messagecounter.MessageCounter; +import org.apache.activemq.artemis.core.messagecounter.MessageCounter.DayCounter; public class MessageCounterHelper { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterManagerImpl.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterManagerImpl.java index 63da652533..a4f11cdda9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterManagerImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.messagecounter.impl; +package org.apache.activemq.artemis.core.messagecounter.impl; import java.util.HashMap; import java.util.HashSet; @@ -25,9 +25,9 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.messagecounter.MessageCounter; -import org.apache.activemq.core.messagecounter.MessageCounterManager; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.messagecounter.MessageCounter; +import org.apache.activemq.artemis.core.messagecounter.MessageCounterManager; /** * diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/PageTransactionInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PageTransactionInfo.java similarity index 82% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/PageTransactionInfo.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PageTransactionInfo.java index 30d74490d8..9b9555168d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/PageTransactionInfo.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PageTransactionInfo.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging; +package org.apache.activemq.artemis.core.paging; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.paging.cursor.PageIterator; -import org.apache.activemq.core.paging.cursor.PagePosition; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.paging.cursor.PageIterator; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.transaction.Transaction; public interface PageTransactionInfo extends EncodingSupport { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagedMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagedMessage.java similarity index 83% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/PagedMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagedMessage.java index 454859e4ff..f9736f53f9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagedMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagedMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging; +package org.apache.activemq.artemis.core.paging; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.ServerMessage; /** * A Paged message. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingManager.java similarity index 82% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/PagingManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingManager.java index 0e9b700db7..cd9dc581bc 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingManager.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging; +package org.apache.activemq.artemis.core.paging; import java.util.Map; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.settings.HierarchicalRepositoryChangeListener; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.settings.HierarchicalRepositoryChangeListener; /** * 

  *
  * +--------------+      1  +----------------+       N +--------------+       N +--------+       1 +-------------------+
- * | {@link org.apache.activemq.core.postoffice.PostOffice} |-------> |{@link PagingManager}|-------> |{@link PagingStore} | ------> | {@link org.apache.activemq.core.paging.impl.Page}  | ------> | {@link org.apache.activemq.core.journal.SequentialFile} |
+ * | {@link org.apache.activemq.artemis.core.postoffice.PostOffice} |-------> |{@link PagingManager}|-------> |{@link PagingStore} | ------> | {@link org.apache.activemq.artemis.core.paging.impl.Page}  | ------> | {@link org.apache.activemq.artemis.core.journal.SequentialFile} |
  * +--------------+         +----------------+         +--------------+         +--------+         +-------------------+
  *                                                              |                  1 ^
  *                                                              |                    |
  *                                                              |                    |
  *                                                              |                    | 1
  *                                                              |            N +----------+
- *                                                              +------------> | {@link org.apache.activemq.core.postoffice.Address} |
+ *                                                              +------------> | {@link org.apache.activemq.artemis.core.postoffice.Address} |
  *                                                                             +----------+
  *
*/ diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStore.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStore.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java index 67489a635f..49949d520d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStore.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging; +package org.apache.activemq.artemis.core.paging; import java.util.Collection; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.paging.cursor.PageCursorProvider; -import org.apache.activemq.core.paging.impl.Page; -import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.RouteContextList; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.paging.cursor.PageCursorProvider; +import org.apache.activemq.artemis.core.paging.impl.Page; +import org.apache.activemq.artemis.core.replication.ReplicationManager; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.RouteContextList; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.transaction.Transaction; /** *

@@ -157,7 +157,7 @@ public interface PagingStore extends ActiveMQComponent /** * Sends the pages with given IDs to the {@link ReplicationManager}. *

- * Sending is done here to avoid exposing the internal {@link org.apache.activemq.core.journal.SequentialFile}s. + * Sending is done here to avoid exposing the internal {@link org.apache.activemq.artemis.core.journal.SequentialFile}s. * * @param replicator * @param pageIds diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStoreFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStoreFactory.java similarity index 80% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStoreFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStoreFactory.java index d843b96dee..8bf7d4dd6b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStoreFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStoreFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging; +package org.apache.activemq.artemis.core.paging; import java.util.List; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; /** * The integration point between the PagingManger and the File System (aka SequentialFiles) diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/LivePageCache.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/LivePageCache.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/LivePageCache.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/LivePageCache.java index e000fc65da..3f7e28e3e0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/LivePageCache.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/LivePageCache.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor; +package org.apache.activemq.artemis.core.paging.cursor; -import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagedMessage; public interface LivePageCache extends PageCache { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCache.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCache.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCache.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCache.java index c27e0b7c56..c6b986ead2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCache.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCache.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor; +package org.apache.activemq.artemis.core.paging.cursor; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.utils.SoftValueHashMap; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.utils.SoftValueHashMap; public interface PageCache extends SoftValueHashMap.ValueCache { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCursorProvider.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCursorProvider.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCursorProvider.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCursorProvider.java index 5d66e8855d..dff4f34262 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCursorProvider.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCursorProvider.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor; +package org.apache.activemq.artemis.core.paging.cursor; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.paging.PagedMessage; /** * The provider of Cursor for a given Address diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageIterator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageIterator.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageIterator.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageIterator.java index c109eb3fcd..91cf306fa7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageIterator.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageIterator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.activemq.core.paging.cursor; +package org.apache.activemq.artemis.core.paging.cursor; -import org.apache.activemq.utils.LinkedListIterator; +import org.apache.activemq.artemis.utils.LinkedListIterator; public interface PageIterator extends LinkedListIterator { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagePosition.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagePosition.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagePosition.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagePosition.java index fc4c1d56a7..374ec7db35 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagePosition.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagePosition.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor; +package org.apache.activemq.artemis.core.paging.cursor; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscription.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscription.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java index 61f00e66eb..e619900272 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscription.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor; +package org.apache.activemq.artemis.core.paging.cursor; import java.util.concurrent.Executor; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.impl.Page; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.utils.LinkedListIterator; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.impl.Page; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.utils.LinkedListIterator; public interface PageSubscription { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscriptionCounter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscriptionCounter.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscriptionCounter.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscriptionCounter.java index c72e2ba74c..c301fd9864 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscriptionCounter.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscriptionCounter.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor; +package org.apache.activemq.artemis.core.paging.cursor; -import org.apache.activemq.core.paging.impl.Page; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.core.paging.impl.Page; +import org.apache.activemq.artemis.core.transaction.Transaction; public interface PageSubscriptionCounter { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReference.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReference.java similarity index 83% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReference.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReference.java index cb82ad48f3..8206ae07a2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReference.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReference.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor; +package org.apache.activemq.artemis.core.paging.cursor; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.server.MessageReference; public interface PagedReference extends MessageReference { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReferenceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReferenceImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java index e5d2847b6d..27c6039c22 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReferenceImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor; +package org.apache.activemq.artemis.core.paging.cursor; import java.lang.ref.WeakReference; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; public class PagedReferenceImpl implements PagedReference { @@ -244,7 +244,7 @@ public class PagedReferenceImpl implements PagedReference } /* (non-Javadoc) - * @see org.apache.activemq.core.server.MessageReference#setConsumerId(java.lang.Long) + * @see org.apache.activemq.artemis.core.server.MessageReference#setConsumerId(java.lang.Long) */ @Override public void setConsumerId(Long consumerID) @@ -253,7 +253,7 @@ public class PagedReferenceImpl implements PagedReference } /* (non-Javadoc) - * @see org.apache.activemq.core.server.MessageReference#getConsumerId() + * @see org.apache.activemq.artemis.core.server.MessageReference#getConsumerId() */ @Override public Long getConsumerId() diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/LivePageCacheImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/LivePageCacheImpl.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/LivePageCacheImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/LivePageCacheImpl.java index 4d11a900e4..4a04f386e9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/LivePageCacheImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/LivePageCacheImpl.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor.impl; +package org.apache.activemq.artemis.core.paging.cursor.impl; import java.util.LinkedList; import java.util.List; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.cursor.LivePageCache; -import org.apache.activemq.core.paging.impl.Page; -import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.cursor.LivePageCache; +import org.apache.activemq.artemis.core.paging.impl.Page; +import org.apache.activemq.artemis.core.server.LargeServerMessage; /** * This is the same as PageCache, however this is for the page that's being currently written. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCacheImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCacheImpl.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCacheImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCacheImpl.java index 90dd4a4314..b88727a334 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCacheImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCacheImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor.impl; +package org.apache.activemq.artemis.core.paging.cursor.impl; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.cursor.PageCache; -import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.cursor.PageCache; +import org.apache.activemq.artemis.core.paging.impl.Page; /** * The caching associated to a single page. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCursorProviderImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCursorProviderImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java index adadd18d8c..318ac72d7d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCursorProviderImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor.impl; +package org.apache.activemq.artemis.core.paging.cursor.impl; import java.util.ArrayList; import java.util.Collection; @@ -24,22 +24,22 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.cursor.PageCache; -import org.apache.activemq.core.paging.cursor.PageCursorProvider; -import org.apache.activemq.core.paging.cursor.PagePosition; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.paging.cursor.PagedReference; -import org.apache.activemq.core.paging.cursor.PagedReferenceImpl; -import org.apache.activemq.core.paging.impl.Page; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.impl.TransactionImpl; -import org.apache.activemq.utils.FutureLatch; -import org.apache.activemq.utils.SoftValueHashMap; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.cursor.PageCache; +import org.apache.activemq.artemis.core.paging.cursor.PageCursorProvider; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.paging.cursor.PagedReference; +import org.apache.activemq.artemis.core.paging.cursor.PagedReferenceImpl; +import org.apache.activemq.artemis.core.paging.impl.Page; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.utils.FutureLatch; +import org.apache.activemq.artemis.utils.SoftValueHashMap; /** * A PageProviderIMpl * diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PagePositionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PagePositionImpl.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PagePositionImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PagePositionImpl.java index 3e944d4d24..9f8f6ce78c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PagePositionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PagePositionImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor.impl; +package org.apache.activemq.artemis.core.paging.cursor.impl; -import org.apache.activemq.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; public class PagePositionImpl implements PagePosition { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java index 91212a95d4..f84011df05 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor.impl; +package org.apache.activemq.artemis.core.paging.cursor.impl; import java.util.ArrayList; import java.util.HashMap; @@ -24,17 +24,17 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.paging.cursor.PageSubscriptionCounter; -import org.apache.activemq.core.paging.impl.Page; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionOperation; -import org.apache.activemq.core.transaction.TransactionOperationAbstract; -import org.apache.activemq.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq.artemis.core.paging.impl.Page; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionOperation; +import org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.artemis.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; /** * This class will encapsulate the persistent counters for the PagingSubscription diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java index 5bf36e64f1..3512c7ed6d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.cursor.impl; +package org.apache.activemq.artemis.core.paging.cursor.impl; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -32,30 +32,30 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.paging.PageTransactionInfo; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.cursor.PageCache; -import org.apache.activemq.core.paging.cursor.PageCursorProvider; -import org.apache.activemq.core.paging.cursor.PageIterator; -import org.apache.activemq.core.paging.cursor.PagePosition; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.paging.cursor.PageSubscriptionCounter; -import org.apache.activemq.core.paging.cursor.PagedReference; -import org.apache.activemq.core.paging.impl.Page; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionOperationAbstract; -import org.apache.activemq.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq.core.transaction.impl.TransactionImpl; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.paging.PageTransactionInfo; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.cursor.PageCache; +import org.apache.activemq.artemis.core.paging.cursor.PageCursorProvider; +import org.apache.activemq.artemis.core.paging.cursor.PageIterator; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq.artemis.core.paging.cursor.PagedReference; +import org.apache.activemq.artemis.core.paging.impl.Page; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.artemis.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.FutureLatch; final class PageSubscriptionImpl implements PageSubscription { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java index 535b5b73ff..992d585e49 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.impl; +package org.apache.activemq.artemis.core.paging.impl; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -22,20 +22,20 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.cursor.LivePageCache; -import org.apache.activemq.core.paging.cursor.PageSubscriptionCounter; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.cursor.LivePageCache; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.DataConstants; public final class Page implements Comparable { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java index c6f5f0bafe..b7f93c2ff5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.impl; +package org.apache.activemq.artemis.core.paging.impl; import java.util.LinkedList; import java.util.List; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.persistence.OperationContext; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.persistence.OperationContext; /** * This will batch multiple calls waiting to perform a sync in a single call. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java index 0fbff99393..aece279552 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.impl; +package org.apache.activemq.artemis.core.paging.impl; import java.util.HashMap; import java.util.LinkedList; @@ -22,18 +22,18 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.paging.PageTransactionInfo; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.cursor.PageIterator; -import org.apache.activemq.core.paging.cursor.PagePosition; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionOperationAbstract; -import org.apache.activemq.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.paging.PageTransactionInfo; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.cursor.PageIterator; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.artemis.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.artemis.utils.DataConstants; public final class PageTransactionInfoImpl implements PageTransactionInfo { @@ -161,7 +161,7 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo /* * This is to be used after paging. We will update the PageTransactions until they get all the messages delivered. On that case we will delete the page TX * (non-Javadoc) - * @see org.apache.activemq.core.paging.PageTransactionInfo#storeUpdate(org.apache.activemq.core.persistence.StorageManager, org.apache.activemq.core.transaction.Transaction, int) + * @see org.apache.activemq.artemis.core.paging.PageTransactionInfo#storeUpdate(org.apache.activemq.artemis.core.persistence.StorageManager, org.apache.activemq.artemis.core.transaction.Transaction, int) */ public void storeUpdate(final StorageManager storageManager, final PagingManager pagingManager, final Transaction tx) throws Exception { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java similarity index 87% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java index e802df4bad..4ffef107eb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.impl; +package org.apache.activemq.artemis.core.paging.impl; import java.util.Arrays; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.utils.DataConstants; /** * This class represents a paged message diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java index 7ca43908d3..6ff63b7fc5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.impl; +package org.apache.activemq.artemis.core.paging.impl; import java.util.List; import java.util.Map; @@ -23,14 +23,14 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.paging.PageTransactionInfo; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.PagingStoreFactory; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.paging.PageTransactionInfo; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.PagingStoreFactory; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; public final class PagingManagerImpl implements PagingManager { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java index 8a301a4c5a..d1b093ae5a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.impl; +package org.apache.activemq.artemis.core.paging.impl; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -28,19 +28,19 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.IOCriticalErrorListener; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.PagingStoreFactory; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.utils.ExecutorFactory; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.IOCriticalErrorListener; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.PagingStoreFactory; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.utils.ExecutorFactory; +import org.apache.activemq.artemis.utils.UUIDGenerator; /** * diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java index 1460148718..d727701d7d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java @@ -14,34 +14,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.paging.impl; +package org.apache.activemq.artemis.core.paging.impl; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.paging.PageTransactionInfo; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.PagingStoreFactory; -import org.apache.activemq.core.paging.cursor.LivePageCache; -import org.apache.activemq.core.paging.cursor.PageCursorProvider; -import org.apache.activemq.core.paging.cursor.impl.LivePageCacheImpl; -import org.apache.activemq.core.paging.cursor.impl.PageCursorProviderImpl; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.RouteContextList; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionOperation; -import org.apache.activemq.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.paging.PageTransactionInfo; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.PagingStoreFactory; +import org.apache.activemq.artemis.core.paging.cursor.LivePageCache; +import org.apache.activemq.artemis.core.paging.cursor.PageCursorProvider; +import org.apache.activemq.artemis.core.paging.cursor.impl.LivePageCacheImpl; +import org.apache.activemq.artemis.core.paging.cursor.impl.PageCursorProviderImpl; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.replication.ReplicationManager; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.RouteContextList; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionOperation; +import org.apache.activemq.artemis.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.artemis.utils.FutureLatch; import java.text.DecimalFormat; import java.util.ArrayList; @@ -971,18 +971,18 @@ public class PagingStoreImpl implements PagingStore private long[] routeQueues(Transaction tx, RouteContextList ctx) throws Exception { - List durableQueues = ctx.getDurableQueues(); - List nonDurableQueues = ctx.getNonDurableQueues(); + List durableQueues = ctx.getDurableQueues(); + List nonDurableQueues = ctx.getNonDurableQueues(); long[] ids = new long[durableQueues.size() + nonDurableQueues.size()]; int i = 0; - for (org.apache.activemq.core.server.Queue q : durableQueues) + for (org.apache.activemq.artemis.core.server.Queue q : durableQueues) { q.getPageSubscription().notEmpty(); ids[i++] = q.getID(); } - for (org.apache.activemq.core.server.Queue q : nonDurableQueues) + for (org.apache.activemq.artemis.core.server.Queue q : nonDurableQueues) { q.getPageSubscription().getCounter().increment(tx, 1); q.getPageSubscription().notEmpty(); @@ -1000,9 +1000,9 @@ public class PagingStoreImpl implements PagingStore */ private void applyPageCounters(Transaction tx, Page page, RouteContextList ctx) throws Exception { - List durableQueues = ctx.getDurableQueues(); - List nonDurableQueues = ctx.getNonDurableQueues(); - for (org.apache.activemq.core.server.Queue q : durableQueues) + List durableQueues = ctx.getDurableQueues(); + List nonDurableQueues = ctx.getNonDurableQueues(); + for (org.apache.activemq.artemis.core.server.Queue q : durableQueues) { if (tx == null) { @@ -1017,7 +1017,7 @@ public class PagingStoreImpl implements PagingStore } } - for (org.apache.activemq.core.server.Queue q : nonDurableQueues) + for (org.apache.activemq.artemis.core.server.Queue q : nonDurableQueues) { q.getPageSubscription().getCounter().increment(tx, 1); } diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/GroupingInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/GroupingInfo.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/GroupingInfo.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/GroupingInfo.java index 8c4594fb5c..3dc2fc65ea 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/GroupingInfo.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/GroupingInfo.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence; +package org.apache.activemq.artemis.core.persistence; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; public interface GroupingInfo { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/OperationContext.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/OperationContext.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/OperationContext.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/OperationContext.java index 256ed5d654..9e747083b5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/OperationContext.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/OperationContext.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence; +package org.apache.activemq.artemis.core.persistence; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.journal.IOCompletion; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.journal.IOCompletion; /** * This represents a set of operations done as part of replication. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/QueueBindingInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/QueueBindingInfo.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java index 0519ca3a60..6e21b3bf97 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/QueueBindingInfo.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence; +package org.apache.activemq.artemis.core.persistence; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; public interface QueueBindingInfo { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java index fcd235a210..b9682053ba 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence; +package org.apache.activemq.artemis.core.persistence; import javax.transaction.xa.Xid; import java.nio.ByteBuffer; @@ -23,34 +23,34 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.journal.JournalLoadInformation; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.paging.PageTransactionInfo; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.cursor.PagePosition; -import org.apache.activemq.core.persistence.config.PersistedAddressSetting; -import org.apache.activemq.core.persistence.config.PersistedRoles; -import org.apache.activemq.core.persistence.impl.PageCountPending; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.RouteContextList; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.group.impl.GroupBinding; -import org.apache.activemq.core.server.impl.JournalLoader; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.utils.IDGenerator; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.journal.JournalLoadInformation; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.paging.PageTransactionInfo; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq.artemis.core.persistence.config.PersistedRoles; +import org.apache.activemq.artemis.core.persistence.impl.PageCountPending; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.replication.ReplicationManager; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.RouteContextList; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.group.impl.GroupBinding; +import org.apache.activemq.artemis.core.server.impl.JournalLoader; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.utils.IDGenerator; /** * A StorageManager @@ -342,7 +342,7 @@ public interface StorageManager extends IDGenerator, ActiveMQComponent Journal getMessageJournal(); /** - * @see org.apache.activemq.core.persistence.impl.journal.JournalStorageManager#startReplication(org.apache.activemq.core.replication.ReplicationManager, org.apache.activemq.core.paging.PagingManager, String, boolean) + * @see org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager#startReplication(org.apache.activemq.artemis.core.replication.ReplicationManager, org.apache.activemq.artemis.core.paging.PagingManager, String, boolean) */ void startReplication(ReplicationManager replicationManager, PagingManager pagingManager, String nodeID, boolean autoFailBack) throws Exception; @@ -409,10 +409,10 @@ public interface StorageManager extends IDGenerator, ActiveMQComponent void readUnLock(); /** - * Closes the {@link org.apache.activemq.utils.IDGenerator} persisting the current record ID. + * Closes the {@link IDGenerator} persisting the current record ID. *

* Effectively a "pre-stop" method. Necessary due to the "stop"-order at - * {@link org.apache.activemq.core.server.impl.ActiveMQServerImpl} + * {@link org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl} */ void persistIdGenerator(); } diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedAddressSetting.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedAddressSetting.java index ef47b31ece..4ebbc81342 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedAddressSetting.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.config; +package org.apache.activemq.artemis.core.persistence.config; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; public class PersistedAddressSetting implements EncodingSupport { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedRoles.java similarity index 97% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedRoles.java index 5211eb2828..2193e69fdb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedRoles.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.config; +package org.apache.activemq.artemis.core.persistence.config; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.EncodingSupport; public class PersistedRoles implements EncodingSupport { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/PageCountPending.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/PageCountPending.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/PageCountPending.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/PageCountPending.java index 36093dd4bd..da12724f9a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/PageCountPending.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/PageCountPending.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.impl; +package org.apache.activemq.artemis.core.persistence.impl; public interface PageCountPending { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/AddMessageRecord.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AddMessageRecord.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/AddMessageRecord.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AddMessageRecord.java index 82e1883623..0652ae785d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/AddMessageRecord.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AddMessageRecord.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.impl.journal; +package org.apache.activemq.artemis.core.persistence.impl.journal; -import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; public final class AddMessageRecord { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java index 5d6903968d..a7e44c06db 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.impl.journal; +package org.apache.activemq.artemis.core.persistence.impl.journal; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.utils.DataConstants; -import org.apache.activemq.utils.IDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.utils.DataConstants; +import org.apache.activemq.artemis.utils.IDGenerator; /** * An ID generator that allocates a batch of IDs of size {@link #checkpointSize} and records the ID diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java similarity index 81% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java index 171ba65f23..fa1e1706fb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.impl.journal; +package org.apache.activemq.artemis.core.persistence.impl.journal; import javax.transaction.xa.Xid; import java.io.PrintStream; @@ -23,60 +23,60 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.journal.PreparedTransactionInfo; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.TransactionFailureCallback; -import org.apache.activemq.core.journal.impl.JournalFile; -import org.apache.activemq.core.journal.impl.JournalImpl; -import org.apache.activemq.core.journal.impl.JournalReaderCallback; -import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq.core.paging.cursor.impl.PageSubscriptionCounterImpl; -import org.apache.activemq.core.paging.impl.PageTransactionInfoImpl; -import org.apache.activemq.core.persistence.impl.journal.BatchingIDGenerator.IDCounterEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.AckDescribe; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.DeliveryCountUpdateEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.DuplicateIDEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.HeuristicCompletionEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.LargeMessageEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageCountPendingImpl; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageCountRecord; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageCountRecordInc; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PendingLargeMessageEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.RefEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.ScheduledDeliveryEncoding; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.utils.Base64; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.TransactionFailureCallback; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.core.journal.impl.JournalReaderCallback; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.artemis.core.paging.cursor.impl.PageSubscriptionCounterImpl; +import org.apache.activemq.artemis.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq.artemis.core.persistence.impl.journal.BatchingIDGenerator.IDCounterEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.AckDescribe; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.DeliveryCountUpdateEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.DuplicateIDEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.HeuristicCompletionEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.LargeMessageEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.PageCountPendingImpl; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.PageCountRecord; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.PageCountRecordInc; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.PendingLargeMessageEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.RefEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.ScheduledDeliveryEncoding; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.utils.Base64; +import org.apache.activemq.artemis.utils.XidCodecSupport; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_REF; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADDRESS_SETTING_RECORD; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_MESSAGE; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_REF; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.HEURISTIC_COMPLETION; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ID_COUNTER_RECORD; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COMPLETE; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_PENDING_COUNTER; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_TRANSACTION; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.QUEUE_BINDING_RECORD; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.SECURITY_RECORD; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.UPDATE_DELIVERY_COUNT; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_REF; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.ADDRESS_SETTING_RECORD; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.ADD_MESSAGE; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.ADD_REF; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.HEURISTIC_COMPLETION; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.ID_COUNTER_RECORD; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COMPLETE; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_PENDING_COUNTER; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.PAGE_TRANSACTION; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.QUEUE_BINDING_RECORD; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.SECURITY_RECORD; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.UPDATE_DELIVERY_COUNT; /** * Outputs a String description of the Journals contents. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalRecordIds.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalRecordIds.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java index 105f14516c..d4977f96e2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalRecordIds.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.impl.journal; +package org.apache.activemq.artemis.core.persistence.impl.journal; /** * These record IDs definitions are meant to be public. @@ -34,7 +34,7 @@ public final class JournalRecordIds /** * Records storing the current recordID number. - * @see org.apache.activemq.utils.IDGenerator + * @see org.apache.activemq.artemis.utils.IDGenerator * @see BatchingIDGenerator */ public static final byte ID_COUNTER_RECORD = 24; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java index 07599fef8a..a1a9f60290 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.impl.journal; +package org.apache.activemq.artemis.core.persistence.impl.journal; import javax.transaction.xa.Xid; import java.io.File; @@ -45,86 +45,86 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.api.core.ActiveMQInternalErrorException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.journal.IOCriticalErrorListener; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.journal.JournalLoadInformation; -import org.apache.activemq.core.journal.PreparedTransactionInfo; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.TransactionFailureCallback; -import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; -import org.apache.activemq.core.journal.impl.JournalFile; -import org.apache.activemq.core.journal.impl.JournalImpl; -import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.paging.PageTransactionInfo; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.cursor.PagePosition; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.paging.cursor.PagedReferenceImpl; -import org.apache.activemq.core.paging.cursor.impl.PagePositionImpl; -import org.apache.activemq.core.paging.impl.PageTransactionInfoImpl; -import org.apache.activemq.core.persistence.GroupingInfo; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.persistence.QueueBindingInfo; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.persistence.config.PersistedAddressSetting; -import org.apache.activemq.core.persistence.config.PersistedRoles; -import org.apache.activemq.core.persistence.impl.PageCountPending; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.DuplicateIDCache; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping; -import org.apache.activemq.core.replication.ReplicatedJournal; -import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.RouteContextList; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.group.impl.GroupBinding; -import org.apache.activemq.core.server.impl.JournalLoader; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.Transaction.State; -import org.apache.activemq.core.transaction.TransactionOperation; -import org.apache.activemq.core.transaction.TransactionOperationAbstract; -import org.apache.activemq.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq.core.transaction.impl.TransactionImpl; -import org.apache.activemq.utils.Base64; -import org.apache.activemq.utils.ByteUtil; -import org.apache.activemq.utils.DataConstants; -import org.apache.activemq.utils.ExecutorFactory; -import org.apache.activemq.utils.ActiveMQThreadFactory; -import org.apache.activemq.utils.UUID; -import org.apache.activemq.utils.XidCodecSupport; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.journal.IOCriticalErrorListener; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.journal.JournalLoadInformation; +import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.TransactionFailureCallback; +import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.paging.PageTransactionInfo; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.paging.cursor.PagedReferenceImpl; +import org.apache.activemq.artemis.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq.artemis.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq.artemis.core.persistence.GroupingInfo; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.persistence.QueueBindingInfo; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq.artemis.core.persistence.config.PersistedRoles; +import org.apache.activemq.artemis.core.persistence.impl.PageCountPending; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping; +import org.apache.activemq.artemis.core.replication.ReplicatedJournal; +import org.apache.activemq.artemis.core.replication.ReplicationManager; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.RouteContextList; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.group.impl.GroupBinding; +import org.apache.activemq.artemis.core.server.impl.JournalLoader; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.Transaction.State; +import org.apache.activemq.artemis.core.transaction.TransactionOperation; +import org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.artemis.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.utils.Base64; +import org.apache.activemq.artemis.utils.ByteUtil; +import org.apache.activemq.artemis.utils.DataConstants; +import org.apache.activemq.artemis.utils.ExecutorFactory; +import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; +import org.apache.activemq.artemis.utils.UUID; +import org.apache.activemq.artemis.utils.XidCodecSupport; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; -import static org.apache.activemq.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.ACKNOWLEDGE_CURSOR; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.ADD_LARGE_MESSAGE_PENDING; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.DUPLICATE_ID; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_INC; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.PAGE_CURSOR_COUNTER_VALUE; +import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME; /** * Controls access to the journals and other storage files such as the ones used to store pages and @@ -353,11 +353,11 @@ public class JournalStorageManager implements StorageManager * To achieve (2), instead of writing directly to instances of {@link JournalImpl}, we write to * instances of {@link ReplicatedJournal}. *

- * At the backup-side replication is handled by {@link org.apache.activemq.core.replication.ReplicationEndpoint}. + * At the backup-side replication is handled by {@link org.apache.activemq.artemis.core.replication.ReplicationEndpoint}. * * @param replicationManager * @param pagingManager - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ @Override public void startReplication(ReplicationManager replicationManager, PagingManager pagingManager, String nodeID, @@ -3143,7 +3143,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.spi.core.remoting.ActiveMQBuffer) + * @see org.apache.activemq.artemis.core.journal.EncodingSupport#decode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) */ public void decode(final ActiveMQBuffer buffer) { @@ -3151,7 +3151,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.spi.core.remoting.ActiveMQBuffer) + * @see org.apache.activemq.artemis.core.journal.EncodingSupport#encode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) */ public void encode(final ActiveMQBuffer buffer) { @@ -3159,7 +3159,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#getEncodeSize() + * @see org.apache.activemq.artemis.core.journal.EncodingSupport#getEncodeSize() */ public int getEncodeSize() { @@ -3182,7 +3182,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.spi.core.remoting.ActiveMQBuffer) + * @see org.apache.activemq.artemis.core.journal.EncodingSupport#decode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) */ public void decode(final ActiveMQBuffer buffer) { @@ -3190,7 +3190,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.spi.core.remoting.ActiveMQBuffer) + * @see org.apache.activemq.artemis.core.journal.EncodingSupport#encode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) */ public void encode(final ActiveMQBuffer buffer) { @@ -3198,7 +3198,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#getEncodeSize() + * @see org.apache.activemq.artemis.core.journal.EncodingSupport#getEncodeSize() */ public int getEncodeSize() { @@ -3307,7 +3307,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#getEncodeSize() + * @see org.apache.activemq.artemis.core.journal.EncodingSupport#getEncodeSize() */ @Override public int getEncodeSize() @@ -3316,7 +3316,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.api.core.ActiveMQBuffer) + * @see org.apache.activemq.artemis.core.journal.EncodingSupport#encode(org.apache.activemq.artemis.api.core.ActiveMQBuffer) */ @Override public void encode(ActiveMQBuffer buffer) @@ -3326,7 +3326,7 @@ public class JournalStorageManager implements StorageManager } /* (non-Javadoc) - * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.api.core.ActiveMQBuffer) + * @see org.apache.activemq.artemis.core.journal.EncodingSupport#decode(org.apache.activemq.artemis.api.core.ActiveMQBuffer) */ @Override public void decode(ActiveMQBuffer buffer) @@ -3532,7 +3532,7 @@ public class JournalStorageManager implements StorageManager * This is only used when loading a transaction. *

* it might be possible to merge the functionality of this class with - * {@link org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.FinishPageMessageOperation} + * {@link org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.FinishPageMessageOperation} */ // TODO: merge this class with the one on the PagingStoreImpl private static class FinishPageMessageOperation extends TransactionOperationAbstract implements TransactionOperation diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java index 61c7d785f7..43f63b5321 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.impl.journal; +package org.apache.activemq.artemis.core.persistence.impl.journal; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.ActiveMQInternalErrorException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.message.BodyEncoder; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.utils.DataConstants; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.message.BodyEncoder; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.utils.DataConstants; +import org.apache.activemq.artemis.utils.TypedProperties; public final class LargeServerMessageImpl extends ServerMessageImpl implements LargeServerMessage { @@ -509,7 +509,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } /* (non-Javadoc) - * @see org.apache.activemq.core.message.BodyEncoder#getLargeBodySize() + * @see org.apache.activemq.artemis.core.message.BodyEncoder#getLargeBodySize() */ public long getLargeBodySize() { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageInSync.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageInSync.java index 9d5d109b50..7420ee040b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageInSync.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.impl.journal; +package org.apache.activemq.artemis.core.persistence.impl.journal; import java.nio.ByteBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.persistence.StorageManager.LargeMessageExtension; -import org.apache.activemq.core.replication.ReplicatedLargeMessage; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.persistence.StorageManager.LargeMessageExtension; +import org.apache.activemq.artemis.core.replication.ReplicatedLargeMessage; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.LargeServerMessage; public final class LargeServerMessageInSync implements ReplicatedLargeMessage { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java index ea068a0506..690093330f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.impl.journal; +package org.apache.activemq.artemis.core.persistence.impl.journal; import java.util.Iterator; import java.util.LinkedList; @@ -23,13 +23,13 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.journal.impl.SimpleWaitIOCallback; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.utils.ExecutorFactory; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.utils.ExecutorFactory; /** * @@ -252,7 +252,7 @@ public class OperationContextImpl implements OperationContext /* * (non-Javadoc) - * @see org.apache.activemq.core.replication.ReplicationToken#complete() + * @see org.apache.activemq.artemis.core.replication.ReplicationToken#complete() */ public void complete() { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java index d61bb1efa4..b8a2ce34d4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.impl.nullpm; +package org.apache.activemq.artemis.core.persistence.impl.nullpm; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; class NullStorageLargeServerMessage extends ServerMessageImpl implements LargeServerMessage { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java index d33a774817..1e3fb55e32 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.persistence.impl.nullpm; +package org.apache.activemq.artemis.core.persistence.impl.nullpm; import javax.transaction.xa.Xid; import java.nio.ByteBuffer; @@ -25,36 +25,36 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.journal.JournalLoadInformation; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.paging.PageTransactionInfo; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.cursor.PagePosition; -import org.apache.activemq.core.persistence.GroupingInfo; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.persistence.QueueBindingInfo; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.persistence.config.PersistedAddressSetting; -import org.apache.activemq.core.persistence.config.PersistedRoles; -import org.apache.activemq.core.persistence.impl.PageCountPending; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.RouteContextList; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.group.impl.GroupBinding; -import org.apache.activemq.core.server.impl.JournalLoader; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.journal.JournalLoadInformation; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.paging.PageTransactionInfo; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.persistence.GroupingInfo; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.persistence.QueueBindingInfo; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq.artemis.core.persistence.config.PersistedRoles; +import org.apache.activemq.artemis.core.persistence.impl.PageCountPending; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.replication.ReplicationManager; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.RouteContextList; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.group.impl.GroupBinding; +import org.apache.activemq.artemis.core.server.impl.JournalLoader; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.Transaction; public class NullStorageManager implements StorageManager { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Address.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Address.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/Address.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Address.java index 0198eee1c4..2f8ea0c860 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Address.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Address.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice; +package org.apache.activemq.artemis.core.postoffice; import java.util.List; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; /** * USed to hold a hierarchical style address, delimited by a '.'. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/AddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/AddressManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java index cd3eb0c371..8e1cd1b7d6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/AddressManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice; +package org.apache.activemq.artemis.core.postoffice; import java.util.Map; import java.util.Set; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.transaction.Transaction; /** * Used to maintain addresses and BindingsImpl. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Binding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Binding.java similarity index 80% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/Binding.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Binding.java index d5c2fbc0ec..2c19c1fe84 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Binding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Binding.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice; +package org.apache.activemq.artemis.core.postoffice; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.server.Bindable; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.group.UnproposalListener; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.server.Bindable; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.group.UnproposalListener; public interface Binding extends UnproposalListener { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingType.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/BindingType.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingType.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/BindingType.java index 2853061e2c..096a0b3d8e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingType.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/BindingType.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice; +package org.apache.activemq.artemis.core.postoffice; -import org.apache.activemq.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; public enum BindingType { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Bindings.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java similarity index 80% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/Bindings.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java index 55fa38a1b4..309cf90428 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/Bindings.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice; +package org.apache.activemq.artemis.core.postoffice; import java.util.Collection; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.group.UnproposalListener; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.group.UnproposalListener; public interface Bindings extends UnproposalListener { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingsFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/BindingsFactory.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingsFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/BindingsFactory.java index aaf569f308..b1ff7175f5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/BindingsFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/BindingsFactory.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice; +package org.apache.activemq.artemis.core.postoffice; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; /** * A factory for creating bindings diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/DuplicateIDCache.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/DuplicateIDCache.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/DuplicateIDCache.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/DuplicateIDCache.java index e513bbdac0..ef231b389d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/DuplicateIDCache.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/DuplicateIDCache.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice; +package org.apache.activemq.artemis.core.postoffice; import java.util.List; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.core.transaction.Transaction; public interface DuplicateIDCache { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/PostOffice.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/PostOffice.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java index fdc8044949..b3f259cf62 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/PostOffice.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice; +package org.apache.activemq.artemis.core.postoffice; import java.util.Map; import java.util.Set; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.QueueCreator; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.QueueCreator; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.transaction.Transaction; /** * diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueBinding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueBinding.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueBinding.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueBinding.java index 9f82b50949..cc56330df3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueBinding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueBinding.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice; +package org.apache.activemq.artemis.core.postoffice; -import org.apache.activemq.core.server.Queue; +import org.apache.activemq.artemis.core.server.Queue; public interface QueueBinding extends Binding { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueInfo.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java index 3da995f3be..0021b5d5a0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/QueueInfo.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/QueueInfo.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice; +package org.apache.activemq.artemis.core.postoffice; import java.io.Serializable; import java.util.List; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; public class QueueInfo implements Serializable { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/AddressImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/AddressImpl.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/AddressImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/AddressImpl.java index 2865279136..dbb314d221 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/AddressImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/AddressImpl.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice.impl; +package org.apache.activemq.artemis.core.postoffice.impl; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.postoffice.Address; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.postoffice.Address; /** * splits an address string into its hierarchical parts split by '.' diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/BindingsImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/BindingsImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java index e23d8d485d..48836549a3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/BindingsImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice.impl; +package org.apache.activemq.artemis.core.postoffice.impl; import java.io.PrintWriter; import java.io.StringWriter; @@ -27,21 +27,21 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.RemoteQueueBinding; -import org.apache.activemq.core.server.group.GroupingHandler; -import org.apache.activemq.core.server.group.impl.Proposal; -import org.apache.activemq.core.server.group.impl.Response; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.Bindings; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq.artemis.core.server.group.GroupingHandler; +import org.apache.activemq.artemis.core.server.group.impl.Proposal; +import org.apache.activemq.artemis.core.server.group.impl.Response; public final class BindingsImpl implements Bindings { @@ -261,7 +261,7 @@ public final class BindingsImpl implements Bindings private void route(final ServerMessage message, final RoutingContext context, final boolean groupRouting) throws Exception { /* This is a special treatment for scaled-down messages involving SnF queues. - * See org.apache.activemq.core.server.impl.ScaleDownHandler.scaleDownMessages() for the logic that sends messages with this property + * See org.apache.activemq.artemis.core.server.impl.ScaleDownHandler.scaleDownMessages() for the logic that sends messages with this property */ if (message.containsProperty(MessageImpl.HDR_SCALEDOWN_TO_IDS)) { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DivertBinding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DivertBinding.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DivertBinding.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DivertBinding.java index edd00ac57c..89d35132b8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DivertBinding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DivertBinding.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice.impl; +package org.apache.activemq.artemis.core.postoffice.impl; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.server.Bindable; -import org.apache.activemq.core.server.Divert; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.server.Bindable; +import org.apache.activemq.artemis.core.server.Divert; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerMessage; public class DivertBinding implements Binding { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DuplicateIDCacheImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DuplicateIDCacheImpl.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DuplicateIDCacheImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DuplicateIDCacheImpl.java index fdff9bed63..cea42cbffc 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/DuplicateIDCacheImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DuplicateIDCacheImpl.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice.impl; +package org.apache.activemq.artemis.core.postoffice.impl; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.DuplicateIDCache; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract; /** * A DuplicateIDCacheImpl diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/LocalQueueBinding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/LocalQueueBinding.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/LocalQueueBinding.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/LocalQueueBinding.java index 5adfe1bf99..eed0ef9134 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/LocalQueueBinding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/LocalQueueBinding.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice.impl; +package org.apache.activemq.artemis.core.postoffice.impl; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.postoffice.QueueBinding; -import org.apache.activemq.core.server.Bindable; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.postoffice.QueueBinding; +import org.apache.activemq.artemis.core.server.Bindable; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerMessage; public class LocalQueueBinding implements QueueBinding { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java index 1294a39097..baab0e1001 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice.impl; +package org.apache.activemq.artemis.core.postoffice.impl; import java.util.ArrayList; import java.util.Collections; @@ -31,56 +31,56 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.activemq.api.core.ActiveMQAddressFullException; -import org.apache.activemq.api.core.ActiveMQDuplicateIdException; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.api.core.management.NotificationType; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.AddressManager; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.postoffice.BindingsFactory; -import org.apache.activemq.core.postoffice.DuplicateIDCache; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.QueueInfo; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.QueueCreator; -import org.apache.activemq.core.server.QueueFactory; -import org.apache.activemq.core.server.RouteContextList; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.group.GroupingHandler; -import org.apache.activemq.core.server.impl.RoutingContextImpl; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.server.management.NotificationListener; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionOperation; -import org.apache.activemq.core.transaction.TransactionOperationAbstract; -import org.apache.activemq.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq.core.transaction.impl.TransactionImpl; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQAddressFullException; +import org.apache.activemq.artemis.api.core.ActiveMQDuplicateIdException; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.api.core.management.NotificationType; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.AddressManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.postoffice.Bindings; +import org.apache.activemq.artemis.core.postoffice.BindingsFactory; +import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.QueueInfo; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.QueueCreator; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.core.server.RouteContextList; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.group.GroupingHandler; +import org.apache.activemq.artemis.core.server.impl.RoutingContextImpl; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.server.management.NotificationListener; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionOperation; +import org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.artemis.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.UUIDGenerator; /** * This is the class that will make the routing to Queues and decide which consumer will get the messages diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/SimpleAddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java similarity index 87% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/SimpleAddressManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java index f003fb8d2b..957845d449 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/SimpleAddressManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice.impl; +package org.apache.activemq.artemis.core.postoffice.impl; import java.util.HashSet; import java.util.Map; @@ -22,17 +22,17 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.postoffice.Address; -import org.apache.activemq.core.postoffice.AddressManager; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.postoffice.BindingsFactory; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionOperationAbstract; -import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.postoffice.Address; +import org.apache.activemq.artemis.core.postoffice.AddressManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.Bindings; +import org.apache.activemq.artemis.core.postoffice.BindingsFactory; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; /** * A simple address manager that maintains the addresses and bindings. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/WildcardAddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/WildcardAddressManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java index 097e171480..4897801949 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/WildcardAddressManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.postoffice.impl; +package org.apache.activemq.artemis.core.postoffice.impl; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.postoffice.Address; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.postoffice.BindingsFactory; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.postoffice.Address; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.Bindings; +import org.apache.activemq.artemis.core.postoffice.BindingsFactory; +import org.apache.activemq.artemis.core.transaction.Transaction; /** * extends the simple manager to allow wildcard addresses to be used. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/ProtocolHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/ProtocolHandler.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java index ca0f391744..dff11be285 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/ProtocolHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol; +package org.apache.activemq.artemis.core.protocol; import java.util.List; import java.util.Map; @@ -35,18 +35,18 @@ import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpRequestDecoder; import io.netty.handler.codec.http.HttpResponseEncoder; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; -import org.apache.activemq.core.protocol.stomp.WebSocketServerHandler; -import org.apache.activemq.core.remoting.impl.netty.ConnectionCreator; -import org.apache.activemq.core.remoting.impl.netty.HttpAcceptorHandler; -import org.apache.activemq.core.remoting.impl.netty.HttpKeepAliveRunnable; -import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor; -import org.apache.activemq.core.remoting.impl.netty.NettyConnector; -import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.spi.core.protocol.ProtocolManager; -import org.apache.activemq.utils.ConfigurationHelper; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq.artemis.core.protocol.stomp.WebSocketServerHandler; +import org.apache.activemq.artemis.core.remoting.impl.netty.ConnectionCreator; +import org.apache.activemq.artemis.core.remoting.impl.netty.HttpAcceptorHandler; +import org.apache.activemq.artemis.core.remoting.impl.netty.HttpKeepAliveRunnable; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.utils.ConfigurationHelper; import static io.netty.handler.codec.http.HttpResponseStatus.FORBIDDEN; import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ServerPacketDecoder.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ServerPacketDecoder.java new file mode 100644 index 0000000000..fec9320213 --- /dev/null +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ServerPacketDecoder.java @@ -0,0 +1,235 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.artemis.core.protocol; + +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT_REPLY; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.NODE_ANNOUNCE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST_RESPONSE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.QUORUM_VOTE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.QUORUM_VOTE_REPLY; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND_TX; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_COMMIT_ROLLBACK; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE_TX; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_END; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_EVENT; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_WRITE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_PREPARE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.REPLICATION_RESPONSE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SCALEDOWN_ANNOUNCEMENT; + +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupRegistrationMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterConnectMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.NodeAnnounceMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupRequestMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.QuorumVoteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationAddMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationCommitMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendLargeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; + +public class ServerPacketDecoder extends ClientPacketDecoder +{ + private static final long serialVersionUID = 3348673114388400766L; + public static final ServerPacketDecoder INSTANCE = new ServerPacketDecoder(); + + @Override + public Packet decode(final ActiveMQBuffer in) + { + final byte packetType = in.readByte(); + + Packet packet; + + switch (packetType) + { + + case SESS_SEND: + { + packet = new SessionSendMessage(new ServerMessageImpl()); + break; + } + case SESS_SEND_LARGE: + { + packet = new SessionSendLargeMessage(new ServerMessageImpl()); + break; + } + case REPLICATION_APPEND: + { + packet = new ReplicationAddMessage(); + break; + } + case REPLICATION_APPEND_TX: + { + packet = new ReplicationAddTXMessage(); + break; + } + case REPLICATION_DELETE: + { + packet = new ReplicationDeleteMessage(); + break; + } + case REPLICATION_DELETE_TX: + { + packet = new ReplicationDeleteTXMessage(); + break; + } + case REPLICATION_PREPARE: + { + packet = new ReplicationPrepareMessage(); + break; + } + case REPLICATION_COMMIT_ROLLBACK: + { + packet = new ReplicationCommitMessage(); + break; + } + case REPLICATION_RESPONSE: + { + packet = new ReplicationResponseMessage(); + break; + } + case REPLICATION_PAGE_WRITE: + { + packet = new ReplicationPageWriteMessage(); + break; + } + case REPLICATION_PAGE_EVENT: + { + packet = new ReplicationPageEventMessage(); + break; + } + case REPLICATION_LARGE_MESSAGE_BEGIN: + { + packet = new ReplicationLargeMessageBeginMessage(); + break; + } + case REPLICATION_LARGE_MESSAGE_END: + { + packet = new ReplicationLargeMessageEndMessage(); + break; + } + case REPLICATION_LARGE_MESSAGE_WRITE: + { + packet = new ReplicationLargeMessageWriteMessage(); + break; + } + case PacketImpl.BACKUP_REGISTRATION: + { + packet = new BackupRegistrationMessage(); + break; + } + case PacketImpl.BACKUP_REGISTRATION_FAILED: + { + packet = new BackupReplicationStartFailedMessage(); + break; + } + case PacketImpl.REPLICATION_START_FINISH_SYNC: + { + packet = new ReplicationStartSyncMessage(); + break; + } + case PacketImpl.REPLICATION_SYNC_FILE: + { + packet = new ReplicationSyncFileMessage(); + break; + } + case PacketImpl.REPLICATION_SCHEDULED_FAILOVER: + { + packet = new ReplicationLiveIsStoppingMessage(); + break; + } + case CLUSTER_CONNECT: + { + packet = new ClusterConnectMessage(); + break; + } + case CLUSTER_CONNECT_REPLY: + { + packet = new ClusterConnectReplyMessage(); + break; + } + case NODE_ANNOUNCE: + { + packet = new NodeAnnounceMessage(); + break; + } + case BACKUP_REQUEST: + { + packet = new BackupRequestMessage(); + break; + } + case BACKUP_REQUEST_RESPONSE: + { + packet = new BackupResponseMessage(); + break; + } + case QUORUM_VOTE: + { + packet = new QuorumVoteMessage(); + break; + } + case QUORUM_VOTE_REPLY: + { + packet = new QuorumVoteReplyMessage(); + break; + } + case SCALEDOWN_ANNOUNCEMENT: + { + packet = new ScaleDownAnnounceMessage(); + break; + } + default: + { + packet = super.decode(packetType); + } + } + + packet.decode(in); + + return packet; + } + +} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java similarity index 74% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java index aed4005d89..192afb60de 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java @@ -14,104 +14,104 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core; +package org.apache.activemq.artemis.core.protocol.core; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CREATE_QUEUE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.DELETE_QUEUE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_CLOSE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_COMMIT; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_CONSUMER_CLOSE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_CREATECONSUMER; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_EXPIRED; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_FLOWTOKEN; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_INDIVIDUAL_ACKNOWLEDGE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_START; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_STOP; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_END; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_FORGET; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_JOIN; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_PREPARE; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_RESUME; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_ROLLBACK; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_START; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_FAILED; -import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_SUSPEND; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATE_QUEUE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.DELETE_QUEUE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_CLOSE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_COMMIT; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_CONSUMER_CLOSE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_CREATECONSUMER; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_EXPIRED; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_FLOWTOKEN; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_INDIVIDUAL_ACKNOWLEDGE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_START; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_STOP; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_END; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_FORGET; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_JOIN; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_PREPARE; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_RESUME; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_ROLLBACK; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_START; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_FAILED; +import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_SUSPEND; import java.util.List; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.ActiveMQInternalErrorException; -import org.apache.activemq.core.exception.ActiveMQXAException; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.NullResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.RollbackMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage_V2; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionExpireMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage_V2; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendLargeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXACommitMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAEndMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAForgetMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAJoinMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAResumeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXARollbackMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAStartMessage; -import org.apache.activemq.core.remoting.CloseListener; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.core.remoting.impl.netty.NettyConnection; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.BindingQueryResult; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.QueueQueryResult; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.ServerSession; -import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.artemis.core.exception.ActiveMQXAException; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.NullResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.RollbackMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage_V2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionExpireMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage_V2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendLargeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXACommitMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAEndMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAForgetMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAJoinMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAResumeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXARollbackMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAStartMessage; +import org.apache.activemq.artemis.core.remoting.CloseListener; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.BindingQueryResult; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.QueueQueryResult; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.ServerSession; +import org.apache.activemq.artemis.spi.core.remoting.Connection; public class ServerSessionPacketHandler implements ChannelHandler { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQPacketHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQPacketHandler.java similarity index 84% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQPacketHandler.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQPacketHandler.java index e6ae69f157..7e7549cc93 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQPacketHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQPacketHandler.java @@ -14,31 +14,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.ActiveMQInternalErrorException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.ChannelHandler; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.ServerSessionPacketHandler; -import org.apache.activemq.core.protocol.core.impl.wireformat.CheckFailoverMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReattachSessionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; -import org.apache.activemq.core.security.ActiveMQPrincipal; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ServerSession; -import org.apache.activemq.core.version.Version; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.ChannelHandler; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.ServerSessionPacketHandler; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CheckFailoverMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSessionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReattachSessionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; +import org.apache.activemq.artemis.core.security.ActiveMQPrincipal; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ServerSession; +import org.apache.activemq.artemis.core.version.Version; /** * A packet handler for all packets that need to be handled at the server level diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java similarity index 83% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java index 0768ccf1b7..8696946b98 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; import java.nio.charset.StandardCharsets; import java.util.List; @@ -24,40 +24,40 @@ import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import io.netty.channel.ChannelPipeline; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.BaseInterceptor; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ClusterTopologyListener; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.protocol.ServerPacketDecoder; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.ChannelHandler; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.ServerSessionPacketHandler; -import org.apache.activemq.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; -import org.apache.activemq.core.protocol.core.impl.wireformat.Ping; -import org.apache.activemq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; -import org.apache.activemq.core.remoting.CloseListener; -import org.apache.activemq.core.remoting.impl.netty.ActiveMQFrameDecoder2; -import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.spi.core.protocol.ConnectionEntry; -import org.apache.activemq.spi.core.protocol.MessageConverter; -import org.apache.activemq.spi.core.protocol.ProtocolManager; -import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.BaseInterceptor; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.protocol.ServerPacketDecoder; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.ChannelHandler; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.ServerSessionPacketHandler; +import org.apache.activemq.artemis.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.Ping; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; +import org.apache.activemq.artemis.core.remoting.CloseListener; +import org.apache.activemq.artemis.core.remoting.impl.netty.ActiveMQFrameDecoder2; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.spi.core.protocol.ConnectionEntry; +import org.apache.activemq.artemis.spi.core.protocol.MessageConverter; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.Connection; class CoreProtocolManager implements ProtocolManager { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManagerFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManagerFactory.java similarity index 80% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManagerFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManagerFactory.java index 147abe09a6..aa9e2a557e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManagerFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreProtocolManagerFactory.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; import java.util.List; -import org.apache.activemq.api.core.BaseInterceptor; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.spi.core.protocol.AbstractProtocolManagerFactory; -import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.api.core.BaseInterceptor; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.spi.core.protocol.AbstractProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; public class CoreProtocolManagerFactory extends AbstractProtocolManagerFactory { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreSessionCallback.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreSessionCallback.java similarity index 73% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreSessionCallback.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreSessionCallback.java index ffc38ed492..08cbca6b71 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreSessionCallback.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/CoreSessionCallback.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl; +package org.apache.activemq.artemis.core.protocol.core.impl; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ServerConsumer; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.spi.core.protocol.ProtocolManager; -import org.apache.activemq.spi.core.protocol.SessionCallback; -import org.apache.activemq.spi.core.remoting.ReadyListener; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ServerConsumer; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.spi.core.remoting.ReadyListener; public final class CoreSessionCallback implements SessionCallback { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java index 55f832ef5f..3cfef688f6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; /** * Registers a given backup-server as the replicating backup of a live server (i.e. a regular diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java index 27b2a4604b..43d87669bd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; import java.util.Collections; import java.util.EnumSet; @@ -26,7 +26,7 @@ import java.util.Map; /** * Informs the Backup trying to start replicating of an error. - * @see org.apache.activemq.core.server.impl.ReplicationError + * @see org.apache.activemq.artemis.core.server.impl.ReplicationError */ public final class BackupReplicationStartFailedMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupRequestMessage.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupRequestMessage.java index a2f363de14..065a249c74 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupRequestMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class BackupRequestMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupResponseMessage.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupResponseMessage.java index 991c3483bc..e73e918254 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupResponseMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class BackupResponseMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterConnectMessage.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterConnectMessage.java index 4b85629e62..ab3d4446c6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterConnectMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ClusterConnectMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java index 3ef280aa20..9f4cac8fb6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ClusterConnectReplyMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java index eb7b627f61..a62c7bdce9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class NodeAnnounceMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/QuorumVoteMessage.java similarity index 81% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/QuorumVoteMessage.java index 46d1de95b7..05648496ce 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/QuorumVoteMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler; -import org.apache.activemq.core.server.cluster.qourum.Vote; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq.artemis.core.server.cluster.qourum.Vote; public class QuorumVoteMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java similarity index 82% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java index 97102dae85..07aa70c125 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler; -import org.apache.activemq.core.server.cluster.qourum.Vote; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq.artemis.core.server.cluster.qourum.Vote; public class QuorumVoteReplyMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java index b3e70fe85a..b194c524a9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.replication.ReplicationManager.ADD_OPERATION_TYPE; public final class ReplicationAddMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java index 3482b968c5..b045ea5d3d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.replication.ReplicationManager.ADD_OPERATION_TYPE; public class ReplicationAddTXMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java index 4efd372619..b0c6a58f45 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public final class ReplicationCommitMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java index 7cbb5f6d0e..5ea4338d54 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public final class ReplicationDeleteMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java index a321396687..684e4c80b5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ReplicationDeleteTXMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java index a6f45f07e3..9fd2ccb5d8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ReplicationLargeMessageBeginMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java index 31a4f2f918..95d44592f3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ReplicationLargeMessageEndMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java index b3ef77fbe4..999a918cab 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public final class ReplicationLargeMessageWriteMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java index 7a9a68e02c..4a44b1f91c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; /** * Message indicating that the live is stopping (a scheduled stop). diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java index 6ffb39362c..10587d4c65 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ReplicationPageEventMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java index 403ca1fb82..11e478e676 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.impl.PagedMessageImpl; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.impl.PagedMessageImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ReplicationPageWriteMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java index e40f22a92e..446650b2e3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public final class ReplicationPrepareMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java similarity index 87% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java index 2f66c5190f..726e4b8c08 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public final class ReplicationResponseMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java index 3ac2a4b674..80a90e16f9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.security.InvalidParameterException; import java.util.Arrays; import java.util.List; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.journal.impl.JournalFile; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.JournalContent; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.JournalContent; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; /** * This message may signal start or end of the replication synchronization. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java index cc8121a9e3..e854fd3e29 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.EnumSet; import java.util.Set; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.JournalContent; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.JournalContent; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; /** - * Message is used to sync {@link org.apache.activemq.core.journal.SequentialFile}s to a backup server. The {@link FileType} controls + * Message is used to sync {@link org.apache.activemq.artemis.core.journal.SequentialFile}s to a backup server. The {@link FileType} controls * which extra information is sent. */ public final class ReplicationSyncFileMessage extends PacketImpl @@ -38,7 +38,7 @@ public final class ReplicationSyncFileMessage extends PacketImpl */ private JournalContent journalType; /** - * This value refers to {@link org.apache.activemq.core.journal.impl.JournalFile#getFileID()}, or the + * This value refers to {@link org.apache.activemq.artemis.core.journal.impl.JournalFile#getFileID()}, or the * message id if we are sync'ing a large-message. */ private long fileId; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java similarity index 87% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java index dee468dd20..6a8be07218 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.core.impl.wireformat; +package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; public class ScaleDownAnnounceMessage extends PacketImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/stomp/WebSocketServerHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/WebSocketServerHandler.java similarity index 99% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/stomp/WebSocketServerHandler.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/WebSocketServerHandler.java index 0149e54504..c639753c14 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/stomp/WebSocketServerHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/WebSocketServerHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; import java.nio.charset.StandardCharsets; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/registry/JndiBindingRegistry.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/registry/JndiBindingRegistry.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/registry/JndiBindingRegistry.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/registry/JndiBindingRegistry.java index 5b33e314ec..af1577c049 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/registry/JndiBindingRegistry.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/registry/JndiBindingRegistry.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.registry; +package org.apache.activemq.artemis.core.registry; -import org.apache.activemq.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.utils.JNDIUtil; import javax.naming.Context; import javax.naming.InitialContext; @@ -124,7 +125,7 @@ public class JndiBindingRegistry implements BindingRegistry // OK } - Context c = org.apache.activemq.utils.JNDIUtil.createContext(context, parentContext); + Context c = JNDIUtil.createContext(context, parentContext); c.rebind(jndiNameInContext, objectToBind); } diff --git a/activemq-server/src/main/java/org/apache/activemq/core/registry/MapBindingRegistry.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/registry/MapBindingRegistry.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/registry/MapBindingRegistry.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/registry/MapBindingRegistry.java index 10beb520a7..12ea765f2d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/registry/MapBindingRegistry.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/registry/MapBindingRegistry.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.registry; +package org.apache.activemq.artemis.core.registry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.activemq.spi.core.naming.BindingRegistry; +import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; public class MapBindingRegistry implements BindingRegistry { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMAcceptor.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMAcceptor.java index d562f1eb21..1c5a53bb8c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMAcceptor.java @@ -14,31 +14,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.invm; +package org.apache.activemq.artemis.core.remoting.impl.invm; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.core.security.ActiveMQPrincipal; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.server.management.NotificationService; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq.utils.ConfigurationHelper; -import org.apache.activemq.utils.ExecutorFactory; -import org.apache.activemq.utils.OrderedExecutorFactory; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.core.security.ActiveMQPrincipal; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.server.management.NotificationService; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.utils.ConfigurationHelper; +import org.apache.activemq.artemis.utils.ExecutorFactory; +import org.apache.activemq.artemis.utils.OrderedExecutorFactory; +import org.apache.activemq.artemis.utils.TypedProperties; public final class InVMAcceptor implements Acceptor { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptorFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMAcceptorFactory.java similarity index 77% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptorFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMAcceptorFactory.java index 3b5f588c31..8107832a6c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptorFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMAcceptorFactory.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.invm; +package org.apache.activemq.artemis.core.remoting.impl.invm; import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.spi.core.protocol.ProtocolManager; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.AcceptorFactory; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.AcceptorFactory; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; public class InVMAcceptorFactory implements AcceptorFactory { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java index 271b948370..2f370a8933 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.invm; +package org.apache.activemq.artemis.core.remoting.impl.invm; import java.util.HashMap; import java.util.Map; @@ -24,18 +24,18 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import io.netty.channel.ChannelFutureListener; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.security.ActiveMQPrincipal; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq.spi.core.remoting.ReadyListener; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.security.ActiveMQPrincipal; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.spi.core.remoting.ReadyListener; +import org.apache.activemq.artemis.utils.UUIDGenerator; public class InVMConnection implements Connection { @@ -282,7 +282,7 @@ public class InVMConnection implements Connection { Map params = new HashMap(); - params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, serverID); + params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, serverID); return new TransportConfiguration(InVMConnectorFactory.class.getName(), params); } diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java index d5a211d605..fb1b4ad717 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.invm; +package org.apache.activemq.artemis.core.remoting.impl.invm; import java.util.Collections; import java.util.HashMap; @@ -23,18 +23,18 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.spi.core.remoting.AbstractConnector; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.ClientProtocolManager; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq.utils.ConfigurationHelper; -import org.apache.activemq.utils.OrderedExecutorFactory; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.spi.core.remoting.AbstractConnector; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.utils.ConfigurationHelper; +import org.apache.activemq.artemis.utils.OrderedExecutorFactory; public class InVMConnector extends AbstractConnector { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnectorFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnectorFactory.java similarity index 81% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnectorFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnectorFactory.java index 46eb8d0101..e6b7dfaa40 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnectorFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnectorFactory.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.invm; +package org.apache.activemq.artemis.core.remoting.impl.invm; import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.ClientProtocolManager; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq.spi.core.remoting.Connector; -import org.apache.activemq.spi.core.remoting.ConnectorFactory; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.spi.core.remoting.Connector; +import org.apache.activemq.artemis.spi.core.remoting.ConnectorFactory; public class InVMConnectorFactory implements ConnectorFactory { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMRegistry.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMRegistry.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMRegistry.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMRegistry.java index a90a418354..5cc93e08b9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMRegistry.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMRegistry.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.invm; +package org.apache.activemq.artemis.core.remoting.impl.invm; -import org.apache.activemq.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/TransportConstants.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/TransportConstants.java index d133d17c30..d01f5a8bc4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/TransportConstants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.invm; +package org.apache.activemq.artemis.core.remoting.impl.invm; public final class TransportConstants diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/ConnectionCreator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ConnectionCreator.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/ConnectionCreator.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ConnectionCreator.java index 7cd409a421..a866ce5643 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/ConnectionCreator.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/ConnectionCreator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpAcceptorHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/HttpAcceptorHandler.java similarity index 99% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpAcceptorHandler.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/HttpAcceptorHandler.java index ab872481bd..4679f50dbb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpAcceptorHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/HttpAcceptorHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ExecutorService; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpKeepAliveRunnable.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/HttpKeepAliveRunnable.java similarity index 97% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpKeepAliveRunnable.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/HttpKeepAliveRunnable.java index b0c41bd201..8e9f468671 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/HttpKeepAliveRunnable.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/HttpKeepAliveRunnable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import java.util.ArrayList; import java.util.List; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java index 87e1ab04bc..02342f798a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; @@ -55,29 +55,29 @@ import io.netty.util.ResourceLeakDetector; import io.netty.util.concurrent.GenericFutureListener; import io.netty.util.concurrent.GlobalEventExecutor; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq.core.protocol.ProtocolHandler; -import org.apache.activemq.core.remoting.impl.ssl.SSLSupport; -import org.apache.activemq.core.security.ActiveMQPrincipal; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.server.management.NotificationService; -import org.apache.activemq.spi.core.protocol.ProtocolManager; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq.utils.ConfigurationHelper; -import org.apache.activemq.utils.ActiveMQThreadFactory; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.artemis.core.protocol.ProtocolHandler; +import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport; +import org.apache.activemq.artemis.core.security.ActiveMQPrincipal; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.server.management.NotificationService; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.utils.ConfigurationHelper; +import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; +import org.apache.activemq.artemis.utils.TypedProperties; /** * A Netty TCP Acceptor that supports SSL diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptorFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptorFactory.java similarity index 77% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptorFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptorFactory.java index 90e08d15c7..ba22395eef 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptorFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptorFactory.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.spi.core.protocol.ProtocolManager; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.AcceptorFactory; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.AcceptorFactory; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; public class NettyAcceptorFactory implements AcceptorFactory { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyServerConnection.java similarity index 82% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyServerConnection.java index 55bd8d06aa..4bfc0d9d58 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyServerConnection.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.impl.netty; +package org.apache.activemq.artemis.core.remoting.impl.netty; import java.util.Map; import io.netty.channel.Channel; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; public class NettyServerConnection extends NettyConnection { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/RemotingService.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/RemotingService.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/server/RemotingService.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/RemotingService.java index ff019f096c..b42feffba9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/RemotingService.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/RemotingService.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.server; +package org.apache.activemq.artemis.core.remoting.server; import java.util.Set; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.security.ActiveMQPrincipal; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.utils.ReusableLatch; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.security.ActiveMQPrincipal; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.utils.ReusableLatch; public interface RemotingService { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java index 147b39add7..d2a76aa83a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.remoting.server.impl; +package org.apache.activemq.artemis.core.remoting.server.impl; import java.security.AccessController; import java.security.PrivilegedAction; @@ -35,41 +35,41 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQInterruptedException; -import org.apache.activemq.api.core.BaseInterceptor; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.impl.CoreProtocolManagerFactory; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.security.ActiveMQPrincipal; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.server.cluster.ClusterManager; -import org.apache.activemq.core.server.impl.ServerSessionImpl; -import org.apache.activemq.core.server.impl.ServiceRegistry; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.spi.core.protocol.ConnectionEntry; -import org.apache.activemq.spi.core.protocol.ProtocolManager; -import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.AcceptorFactory; -import org.apache.activemq.spi.core.remoting.BufferHandler; -import org.apache.activemq.spi.core.remoting.Connection; -import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq.utils.ActiveMQThreadFactory; -import org.apache.activemq.utils.ClassloadingUtil; -import org.apache.activemq.utils.ConfigurationHelper; -import org.apache.activemq.utils.ReusableLatch; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException; +import org.apache.activemq.artemis.api.core.BaseInterceptor; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.impl.CoreProtocolManagerFactory; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.security.ActiveMQPrincipal; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.server.cluster.ClusterManager; +import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl; +import org.apache.activemq.artemis.core.server.impl.ServiceRegistry; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.spi.core.protocol.ConnectionEntry; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.AcceptorFactory; +import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; +import org.apache.activemq.artemis.spi.core.remoting.Connection; +import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; +import org.apache.activemq.artemis.utils.ClassloadingUtil; +import org.apache.activemq.artemis.utils.ConfigurationHelper; +import org.apache.activemq.artemis.utils.ReusableLatch; public class RemotingServiceImpl implements RemotingService, ConnectionLifeCycleListener { @@ -664,7 +664,7 @@ public class RemotingServiceImpl implements RemotingService, ConnectionLifeCycle private ClusterConnection lookupClusterConnection(TransportConfiguration acceptorConfig) { - String clusterConnectionName = (String) acceptorConfig.getParams().get(org.apache.activemq.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION); + String clusterConnectionName = (String) acceptorConfig.getParams().get(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION); ClusterConnection clusterConnection = null; if (clusterConnectionName != null) diff --git a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedJournal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java similarity index 81% rename from activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedJournal.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java index d5825492b8..203253a437 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedJournal.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java @@ -14,32 +14,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.replication; +package org.apache.activemq.artemis.core.replication; import java.util.List; import java.util.Map; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.journal.IOCompletion; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.journal.JournalLoadInformation; -import org.apache.activemq.core.journal.LoaderCallback; -import org.apache.activemq.core.journal.PreparedTransactionInfo; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.TransactionFailureCallback; -import org.apache.activemq.core.journal.impl.JournalFile; -import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.journal.IOCompletion; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.journal.JournalLoadInformation; +import org.apache.activemq.artemis.core.journal.LoaderCallback; +import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.TransactionFailureCallback; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.replication.ReplicationManager.ADD_OPERATION_TYPE; /** - * Used by the {@link org.apache.activemq.core.persistence.impl.journal.JournalStorageManager} to replicate journal calls. + * Used by the {@link org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager} to replicate journal calls. *

* This class wraps a {@link ReplicationManager} and the local {@link Journal}. Every call will be * relayed to both instances. * - * @see org.apache.activemq.core.persistence.impl.journal.JournalStorageManager + * @see org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager */ public class ReplicatedJournal implements Journal { @@ -72,7 +72,7 @@ public class ReplicatedJournal implements Journal * @param record * @param sync * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendAddRecord(long, byte, byte[], boolean) + * @see org.apache.activemq.artemis.core.journal.Journal#appendAddRecord(long, byte, byte[], boolean) */ public void appendAddRecord(final long id, final byte recordType, final byte[] record, final boolean sync) throws Exception { @@ -95,7 +95,7 @@ public class ReplicatedJournal implements Journal * @param record * @param sync * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendAddRecord(long, byte, org.apache.activemq.core.journal.EncodingSupport, boolean) + * @see org.apache.activemq.artemis.core.journal.Journal#appendAddRecord(long, byte, org.apache.activemq.artemis.core.journal.EncodingSupport, boolean) */ public void appendAddRecord(final long id, final byte recordType, @@ -117,7 +117,7 @@ public class ReplicatedJournal implements Journal * @param recordType * @param record * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, byte[]) + * @see org.apache.activemq.artemis.core.journal.Journal#appendAddRecordTransactional(long, long, byte, byte[]) */ public void appendAddRecordTransactional(final long txID, final long id, final byte recordType, final byte[] record) throws Exception { @@ -130,7 +130,7 @@ public class ReplicatedJournal implements Journal * @param recordType * @param record * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.apache.activemq.core.journal.EncodingSupport) + * @see org.apache.activemq.artemis.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.apache.activemq.artemis.core.journal.EncodingSupport) */ public void appendAddRecordTransactional(final long txID, final long id, @@ -149,7 +149,7 @@ public class ReplicatedJournal implements Journal * @param txID * @param sync * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendCommitRecord(long, boolean) + * @see org.apache.activemq.artemis.core.journal.Journal#appendCommitRecord(long, boolean) */ public void appendCommitRecord(final long txID, final boolean sync) throws Exception { @@ -186,7 +186,7 @@ public class ReplicatedJournal implements Journal * @param id * @param sync * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendDeleteRecord(long, boolean) + * @see org.apache.activemq.artemis.core.journal.Journal#appendDeleteRecord(long, boolean) */ @Override public void appendDeleteRecord(final long id, final boolean sync) throws Exception @@ -215,7 +215,7 @@ public class ReplicatedJournal implements Journal * @param id * @param record * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendDeleteRecordTransactional(long, long, byte[]) + * @see org.apache.activemq.artemis.core.journal.Journal#appendDeleteRecordTransactional(long, long, byte[]) */ public void appendDeleteRecordTransactional(final long txID, final long id, final byte[] record) throws Exception { @@ -227,7 +227,7 @@ public class ReplicatedJournal implements Journal * @param id * @param record * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.apache.activemq.core.journal.EncodingSupport) + * @see org.apache.activemq.artemis.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.apache.activemq.artemis.core.journal.EncodingSupport) */ public void appendDeleteRecordTransactional(final long txID, final long id, final EncodingSupport record) throws Exception { @@ -243,7 +243,7 @@ public class ReplicatedJournal implements Journal * @param txID * @param id * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendDeleteRecordTransactional(long, long) + * @see org.apache.activemq.artemis.core.journal.Journal#appendDeleteRecordTransactional(long, long) */ public void appendDeleteRecordTransactional(final long txID, final long id) throws Exception { @@ -260,7 +260,7 @@ public class ReplicatedJournal implements Journal * @param transactionData * @param sync * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendPrepareRecord(long, byte[], boolean) + * @see org.apache.activemq.artemis.core.journal.Journal#appendPrepareRecord(long, byte[], boolean) */ public void appendPrepareRecord(final long txID, final byte[] transactionData, final boolean sync) throws Exception { @@ -272,7 +272,7 @@ public class ReplicatedJournal implements Journal * @param transactionData * @param sync * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendPrepareRecord(long, org.apache.activemq.core.journal.EncodingSupport, boolean) + * @see org.apache.activemq.artemis.core.journal.Journal#appendPrepareRecord(long, org.apache.activemq.artemis.core.journal.EncodingSupport, boolean) */ public void appendPrepareRecord(final long txID, final EncodingSupport transactionData, final boolean sync) throws Exception { @@ -302,7 +302,7 @@ public class ReplicatedJournal implements Journal * @param txID * @param sync * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendRollbackRecord(long, boolean) + * @see org.apache.activemq.artemis.core.journal.Journal#appendRollbackRecord(long, boolean) */ public void appendRollbackRecord(final long txID, final boolean sync) throws Exception { @@ -330,7 +330,7 @@ public class ReplicatedJournal implements Journal * @param record * @param sync * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean) + * @see org.apache.activemq.artemis.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean) */ public void appendUpdateRecord(final long id, final byte recordType, final byte[] record, final boolean sync) throws Exception { @@ -343,7 +343,7 @@ public class ReplicatedJournal implements Journal * @param record * @param sync * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendUpdateRecord(long, byte, org.apache.activemq.core.journal.EncodingSupport, boolean) + * @see org.apache.activemq.artemis.core.journal.Journal#appendUpdateRecord(long, byte, org.apache.activemq.artemis.core.journal.EncodingSupport, boolean) */ @Override public void appendUpdateRecord(final long id, final byte recordType, final EncodingSupport record, final boolean sync) throws Exception @@ -377,7 +377,7 @@ public class ReplicatedJournal implements Journal * @param recordType * @param record * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, byte[]) + * @see org.apache.activemq.artemis.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, byte[]) */ public void appendUpdateRecordTransactional(final long txID, final long id, final byte recordType, final byte[] record) throws Exception @@ -391,7 +391,7 @@ public class ReplicatedJournal implements Journal * @param recordType * @param record * @throws Exception - * @see org.apache.activemq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.apache.activemq.core.journal.EncodingSupport) + * @see org.apache.activemq.artemis.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.apache.activemq.artemis.core.journal.EncodingSupport) */ public void appendUpdateRecordTransactional(final long txID, final long id, final byte recordType, final EncodingSupport record) throws Exception @@ -411,7 +411,7 @@ public class ReplicatedJournal implements Journal * @param transactionFailure * * @throws Exception - * @see org.apache.activemq.core.journal.Journal#load(java.util.List, java.util.List, org.apache.activemq.core.journal.TransactionFailureCallback) + * @see org.apache.activemq.artemis.core.journal.Journal#load(java.util.List, java.util.List, org.apache.activemq.artemis.core.journal.TransactionFailureCallback) */ public JournalLoadInformation load(final List committedRecords, final List preparedTransactions, @@ -424,7 +424,7 @@ public class ReplicatedJournal implements Journal * @param reloadManager * * @throws Exception - * @see org.apache.activemq.core.journal.Journal#load(org.apache.activemq.core.journal.LoaderCallback) + * @see org.apache.activemq.artemis.core.journal.Journal#load(org.apache.activemq.artemis.core.journal.LoaderCallback) */ public JournalLoadInformation load(final LoaderCallback reloadManager) throws Exception { @@ -434,7 +434,7 @@ public class ReplicatedJournal implements Journal /** * @param pages * @throws Exception - * @see org.apache.activemq.core.journal.Journal#perfBlast(int) + * @see org.apache.activemq.artemis.core.journal.Journal#perfBlast(int) */ public void perfBlast(final int pages) { @@ -443,7 +443,7 @@ public class ReplicatedJournal implements Journal /** * @throws Exception - * @see org.apache.activemq.core.server.ActiveMQComponent#start() + * @see org.apache.activemq.artemis.core.server.ActiveMQComponent#start() */ public void start() throws Exception { @@ -452,7 +452,7 @@ public class ReplicatedJournal implements Journal /** * @throws Exception - * @see org.apache.activemq.core.server.ActiveMQComponent#stop() + * @see org.apache.activemq.artemis.core.server.ActiveMQComponent#stop() */ public void stop() throws Exception { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedLargeMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedLargeMessage.java similarity index 62% rename from activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedLargeMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedLargeMessage.java index 2215bc1a5c..93b57dff4f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicatedLargeMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedLargeMessage.java @@ -14,36 +14,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.replication; +package org.apache.activemq.artemis.core.replication; -import org.apache.activemq.api.core.Message; +import org.apache.activemq.artemis.api.core.Message; /** - * {@link org.apache.activemq.core.server.LargeServerMessage} methods used by the {@link ReplicationEndpoint}. + * {@link org.apache.activemq.artemis.core.server.LargeServerMessage} methods used by the {@link ReplicationEndpoint}. *

- * In practice a subset of the methods necessary to have a {@link org.apache.activemq.core.server.LargeServerMessage} + * In practice a subset of the methods necessary to have a {@link org.apache.activemq.artemis.core.server.LargeServerMessage} * - * @see org.apache.activemq.core.persistence.impl.journal.LargeServerMessageInSync + * @see org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageInSync */ public interface ReplicatedLargeMessage { /** - * @see org.apache.activemq.core.server.LargeServerMessage#setDurable(boolean) + * @see org.apache.activemq.artemis.core.server.LargeServerMessage#setDurable(boolean) */ Message setDurable(boolean b); /** - * @see org.apache.activemq.core.server.LargeServerMessage#setMessageID(long) + * @see org.apache.activemq.artemis.core.server.LargeServerMessage#setMessageID(long) */ Message setMessageID(long id); /** - * @see org.apache.activemq.core.server.LargeServerMessage#releaseResources() + * @see org.apache.activemq.artemis.core.server.LargeServerMessage#releaseResources() */ void releaseResources(); /** - * @see org.apache.activemq.core.server.LargeServerMessage#deleteFile() + * @see org.apache.activemq.artemis.core.server.LargeServerMessage#deleteFile() */ void deleteFile() throws Exception; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java similarity index 87% rename from activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java index 9b0872b2d2..32ad0ec6f2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.replication; +package org.apache.activemq.artemis.core.replication; import java.io.File; import java.io.FileOutputStream; @@ -31,54 +31,54 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.journal.IOCriticalErrorListener; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.journal.Journal.JournalState; -import org.apache.activemq.core.journal.JournalLoadInformation; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.impl.FileWrapperJournal; -import org.apache.activemq.core.journal.impl.JournalFile; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.impl.Page; -import org.apache.activemq.core.paging.impl.PagingManagerImpl; -import org.apache.activemq.core.paging.impl.PagingStoreFactoryNIO; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.JournalContent; -import org.apache.activemq.core.persistence.impl.journal.LargeServerMessageInSync; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.ChannelHandler; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationCommitMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage.SyncDataType; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; -import org.apache.activemq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.journal.IOCriticalErrorListener; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.journal.Journal.JournalState; +import org.apache.activemq.artemis.core.journal.JournalLoadInformation; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.impl.FileWrapperJournal; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.impl.Page; +import org.apache.activemq.artemis.core.paging.impl.PagingManagerImpl; +import org.apache.activemq.artemis.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.JournalContent; +import org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageInSync; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.ChannelHandler; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationAddMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationCommitMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage.SyncDataType; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; +import org.apache.activemq.artemis.core.replication.ReplicationManager.ADD_OPERATION_TYPE; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.SharedNothingBackupActivation; /** * Handles all the synchronization necessary for replication on the backup side (that is the @@ -261,7 +261,7 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon /** * @param packet - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ private void handleLiveStopping(ReplicationLiveIsStoppingMessage packet) throws ActiveMQException { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java similarity index 84% rename from activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java index 698962a38c..2a3135485e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.replication; +package org.apache.activemq.artemis.core.replication; import java.io.FileInputStream; import java.nio.ByteBuffer; @@ -26,44 +26,44 @@ import java.util.Queue; import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.SessionFailureListener; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.impl.JournalFile; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.JournalContent; -import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.ChannelHandler; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationCommitMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.utils.ExecutorFactory; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.SessionFailureListener; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.JournalContent; +import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.ChannelHandler; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationAddMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationCommitMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.utils.ExecutorFactory; /** * Manages replication tasks on the live server (that is the live server side of a "remote backup" @@ -481,7 +481,7 @@ public final class ReplicationManager implements ActiveMQComponent /** * Sends the whole content of the file to be duplicated. * - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException * @throws Exception */ public void syncJournalFile(JournalFile jf, JournalContent content) throws Exception @@ -596,7 +596,7 @@ public final class ReplicationManager implements ActiveMQComponent * * @param datafiles * @param contentType - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ public void sendStartSyncMessage(JournalFile[] datafiles, JournalContent contentType, String nodeID, boolean allowsAutoFailBack) throws ActiveMQException diff --git a/activemq-server/src/main/java/org/apache/activemq/core/security/CheckType.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/CheckType.java similarity index 97% rename from activemq-server/src/main/java/org/apache/activemq/core/security/CheckType.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/security/CheckType.java index e235ec5ab1..bf2b9b8c14 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/security/CheckType.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/CheckType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.security; +package org.apache.activemq.artemis.core.security; public enum CheckType { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/security/SecurityStore.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/SecurityStore.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/security/SecurityStore.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/security/SecurityStore.java index 67c55fdf6a..f86dfa163e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/security/SecurityStore.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/SecurityStore.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.security; +package org.apache.activemq.artemis.core.security; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.ServerSession; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.ServerSession; public interface SecurityStore { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/security/User.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/User.java similarity index 97% rename from activemq-server/src/main/java/org/apache/activemq/core/security/User.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/security/User.java index e79334f694..3b4736dfb4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/security/User.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/User.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.security; +package org.apache.activemq.artemis.core.security; public class User { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/security/impl/SecurityStoreImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/security/impl/SecurityStoreImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java index 53ff7b4c64..cb55f1edc0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/security/impl/SecurityStoreImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.security.impl; +package org.apache.activemq.artemis.core.security.impl; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.core.security.CheckType; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.security.SecurityStore; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ServerSession; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.server.management.NotificationService; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.HierarchicalRepositoryChangeListener; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.core.security.CheckType; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.security.SecurityStore; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ServerSession; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.server.management.NotificationService; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.HierarchicalRepositoryChangeListener; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.TypedProperties; /** * The ActiveMQ SecurityStore implementation diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActivateCallback.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActivateCallback.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ActivateCallback.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActivateCallback.java index f9d606ddd2..94cd71a1ee 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActivateCallback.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActivateCallback.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 ActivateCallback { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActivationParams.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActivationParams.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ActivationParams.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActivationParams.java index 4e0147035c..62e84c43f1 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActivationParams.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActivationParams.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 class ActivationParams { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java index 48e51a7016..4e7ee0d005 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java @@ -14,28 +14,28 @@ * 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; -import org.apache.activemq.api.core.ActiveMQAddressFullException; -import org.apache.activemq.api.core.ActiveMQClusterSecurityException; -import org.apache.activemq.api.core.ActiveMQConnectionTimedOutException; -import org.apache.activemq.api.core.ActiveMQDisconnectedException; -import org.apache.activemq.api.core.ActiveMQDuplicateMetaDataException; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.api.core.ActiveMQIncompatibleClientServerException; -import org.apache.activemq.api.core.ActiveMQInternalErrorException; -import org.apache.activemq.api.core.ActiveMQInvalidFilterExpressionException; -import org.apache.activemq.api.core.ActiveMQInvalidTransientQueueUseException; -import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; -import org.apache.activemq.api.core.ActiveMQQueueExistsException; -import org.apache.activemq.api.core.ActiveMQSecurityException; -import org.apache.activemq.api.core.ActiveMQSessionCreationException; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; -import org.apache.activemq.core.security.CheckType; +import org.apache.activemq.artemis.api.core.ActiveMQAddressFullException; +import org.apache.activemq.artemis.api.core.ActiveMQClusterSecurityException; +import org.apache.activemq.artemis.api.core.ActiveMQConnectionTimedOutException; +import org.apache.activemq.artemis.api.core.ActiveMQDisconnectedException; +import org.apache.activemq.artemis.api.core.ActiveMQDuplicateMetaDataException; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.ActiveMQIncompatibleClientServerException; +import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.artemis.api.core.ActiveMQInvalidFilterExpressionException; +import org.apache.activemq.artemis.api.core.ActiveMQInvalidTransientQueueUseException; +import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException; +import org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException; +import org.apache.activemq.artemis.api.core.ActiveMQSecurityException; +import org.apache.activemq.artemis.api.core.ActiveMQSessionCreationException; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; +import org.apache.activemq.artemis.core.security.CheckType; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; @@ -280,25 +280,25 @@ public interface ActiveMQMessageBundle IllegalArgumentException autoConvertError(Class aClass); /** - * Message used on on {@link org.apache.activemq.core.server.impl.ActiveMQServerImpl#destroyConnectionWithSessionMetadata(String, String)} + * Message used on on {@link org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl#destroyConnectionWithSessionMetadata(String, String)} */ @Message(id = 119076, value = "Executing destroyConnection with {0}={1} through management''s request", format = Message.Format.MESSAGE_FORMAT) String destroyConnectionWithSessionMetadataHeader(String key, String value); /** - * Message used on on {@link org.apache.activemq.core.server.impl.ActiveMQServerImpl#destroyConnectionWithSessionMetadata(String, String)} + * Message used on on {@link org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl#destroyConnectionWithSessionMetadata(String, String)} */ @Message(id = 119077, value = "Closing connection {0}", format = Message.Format.MESSAGE_FORMAT) String destroyConnectionWithSessionMetadataClosingConnection(String serverSessionString); /** - * Exception used on on {@link org.apache.activemq.core.server.impl.ActiveMQServerImpl#destroyConnectionWithSessionMetadata(String, String)} + * Exception used on on {@link org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl#destroyConnectionWithSessionMetadata(String, String)} */ @Message(id = 119078, value = "Disconnected per admin''s request on {0}={1}", format = Message.Format.MESSAGE_FORMAT) ActiveMQDisconnectedException destroyConnectionWithSessionMetadataSendException(String key, String value); /** - * Message used on on {@link org.apache.activemq.core.server.impl.ActiveMQServerImpl#destroyConnectionWithSessionMetadata(String, String)} + * Message used on on {@link org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl#destroyConnectionWithSessionMetadata(String, String)} */ @Message(id = 119079, value = "No session found with {0}={1}", format = Message.Format.MESSAGE_FORMAT) String destroyConnectionWithSessionMetadataNoSessionFound(String key, String value); diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java similarity index 79% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServer.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java index fde78d447c..b804b4ce4a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServer.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java @@ -14,39 +14,39 @@ * 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; import java.util.List; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.config.BridgeConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.DivertConfiguration; -import org.apache.activemq.core.management.impl.ActiveMQServerControlImpl; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.security.SecurityStore; -import org.apache.activemq.core.server.cluster.ClusterManager; -import org.apache.activemq.core.server.cluster.ha.HAPolicy; -import org.apache.activemq.core.server.group.GroupingHandler; -import org.apache.activemq.core.server.impl.Activation; -import org.apache.activemq.core.server.impl.ConnectorsService; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.version.Version; -import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.protocol.SessionCallback; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.utils.ExecutorFactory; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.config.BridgeConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.DivertConfiguration; +import org.apache.activemq.artemis.core.management.impl.ActiveMQServerControlImpl; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.replication.ReplicationManager; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.security.SecurityStore; +import org.apache.activemq.artemis.core.server.cluster.ClusterManager; +import org.apache.activemq.artemis.core.server.cluster.ha.HAPolicy; +import org.apache.activemq.artemis.core.server.group.GroupingHandler; +import org.apache.activemq.artemis.core.server.impl.Activation; +import org.apache.activemq.artemis.core.server.impl.ConnectorsService; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.version.Version; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.utils.ExecutorFactory; /** * This interface defines the internal interface of the ActiveMQ Server exposed to other components @@ -150,7 +150,7 @@ public interface ActiveMQServer extends ActiveMQComponent void setJMSQueueCreator(QueueCreator queueCreator); /** - * @see {@link org.apache.activemq.core.server.ActiveMQServer#setJMSQueueCreator(QueueCreator)} * + * @see {@link org.apache.activemq.artemis.core.server.ActiveMQServer#setJMSQueueCreator(QueueCreator)} * * * * @return */ diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java similarity index 97% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServerLogger.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java index fb64626196..ba2435646d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServerLogger.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.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; /** * Logger Code 22 @@ -40,26 +40,26 @@ import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import io.netty.channel.Channel; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.impl.JournalFile; -import org.apache.activemq.core.paging.cursor.PagePosition; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.apache.activemq.core.server.cluster.Bridge; -import org.apache.activemq.core.server.cluster.impl.BridgeImpl; -import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.ServerSessionImpl; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq.artemis.core.server.cluster.Bridge; +import org.apache.activemq.artemis.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.utils.FutureLatch; import org.jboss.logging.BasicLogger; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.LogMessage; @@ -81,11 +81,11 @@ public interface ActiveMQServerLogger extends BasicLogger void serverStarting(String type, Configuration configuration); @LogMessage(level = Logger.Level.INFO) - @Message(id = 221001, value = "Apache ActiveMQ Message Broker version {0} [nodeID={1}] {2}", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 221001, value = "Apache ActiveMQ Artemis Message Broker version {0} [nodeID={1}] {2}", format = Message.Format.MESSAGE_FORMAT) void serverStarted(String fullVersion, SimpleString nodeId, String identity); @LogMessage(level = Logger.Level.INFO) - @Message(id = 221002, value = "Apache ActiveMQ Message Broker version {0} [{1}] stopped", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 221002, value = "Apache ActiveMQ Artemis Message Broker version {0} [{1}] stopped", format = Message.Format.MESSAGE_FORMAT) void serverStopped(String version, SimpleString nodeId); @LogMessage(level = Logger.Level.INFO) @@ -114,7 +114,7 @@ public interface ActiveMQServerLogger extends BasicLogger void awaitFailBack(); @LogMessage(level = Logger.Level.INFO) - @Message(id = 221109, value = "Apache ActiveMQ Backup Server version {0} [{1}] started, waiting live to fail before it gets active", + @Message(id = 221109, value = "Apache ActiveMQ Artemis Backup Server version {0} [{1}] started, waiting live to fail before it gets active", format = Message.Format.MESSAGE_FORMAT) void backupServerStarted(String version, SimpleString nodeID); @@ -322,7 +322,7 @@ public interface ActiveMQServerLogger extends BasicLogger void divertBindingNotExists(SimpleString bindingName); @LogMessage(level = Logger.Level.WARN) - @Message(id = 222007, value = "Security risk! Apache ActiveMQ is running with the default cluster admin user and default password. Please see the cluster chapter in the ActiveMQ User Guide for instructions on how to change this.", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 222007, value = "Security risk! Apache ActiveMQ Artemis is running with the default cluster admin user and default password. Please see the cluster chapter in the ActiveMQ User Guide for instructions on how to change this.", format = Message.Format.MESSAGE_FORMAT) void clusterSecurityRisk(); @LogMessage(level = Logger.Level.WARN) @@ -983,7 +983,7 @@ public interface ActiveMQServerLogger extends BasicLogger void backupMovingDataAway(String oldPath, String newPath); @LogMessage(level = Logger.Level.WARN) - @Message(id = 222163, value = "Server is being completely stopped, since this was a replicated backup there may be journal files that need cleaning up. The Apache ActiveMQ broker will have to be manually restarted.", + @Message(id = 222163, value = "Server is being completely stopped, since this was a replicated backup there may be journal files that need cleaning up. The Apache ActiveMQ Artemis broker will have to be manually restarted.", format = Message.Format.MESSAGE_FORMAT) void stopReplicatedBackupAfterFailback(); diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServers.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServers.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServers.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServers.java index 36d0cdb5a8..a9619206ee 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServers.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServers.java @@ -14,16 +14,16 @@ * 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; import java.lang.management.ManagementFactory; import javax.management.MBeanServer; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl; /** * ActiveMQServers is a factory class for instantiating ActiveMQServer instances. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/AutoCreatedQueueManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/AutoCreatedQueueManager.java similarity index 84% rename from activemq-server/src/main/java/org/apache/activemq/core/server/AutoCreatedQueueManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/AutoCreatedQueueManager.java index 32c6e4ae9f..282004a13e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/AutoCreatedQueueManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/AutoCreatedQueueManager.java @@ -14,10 +14,10 @@ * 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; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.utils.ReferenceCounter; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.utils.ReferenceCounter; public interface AutoCreatedQueueManager extends ReferenceCounter { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/Bindable.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Bindable.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/server/Bindable.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Bindable.java index dd2d51ba9d..50f9f9286c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/Bindable.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Bindable.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 Bindable { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/BindingQueryResult.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/BindingQueryResult.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/server/BindingQueryResult.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/BindingQueryResult.java index 511dd87668..5ea4279f0e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/BindingQueryResult.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/BindingQueryResult.java @@ -14,11 +14,11 @@ * 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; import java.util.List; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; public class BindingQueryResult { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorService.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ConnectorService.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorService.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ConnectorService.java index 546481a155..ce6886a3b4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorService.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ConnectorService.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 ConnectorService extends ActiveMQComponent { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorServiceFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ConnectorServiceFactory.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorServiceFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ConnectorServiceFactory.java index 9cb6684ca6..252a805236 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ConnectorServiceFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ConnectorServiceFactory.java @@ -14,10 +14,10 @@ * 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; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; import java.util.Map; import java.util.Set; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/Consumer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Consumer.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/server/Consumer.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Consumer.java index b866b53bae..e81bbe730f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/Consumer.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Consumer.java @@ -14,11 +14,11 @@ * 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; import java.util.List; -import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.artemis.core.filter.Filter; public interface Consumer { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/Divert.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Divert.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/server/Divert.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Divert.java index d41906b115..ae95960eab 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/Divert.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Divert.java @@ -14,10 +14,10 @@ * 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; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; public interface Divert extends Bindable { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/HandleStatus.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/HandleStatus.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/server/HandleStatus.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/HandleStatus.java index 625098f4cb..98a6c652c3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/HandleStatus.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/HandleStatus.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; /** * diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/JournalType.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/JournalType.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/server/JournalType.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/JournalType.java index 5b183685fc..2a1ccc6dc7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/JournalType.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/JournalType.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 enum JournalType { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/LargeServerMessage.java similarity index 84% rename from activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/LargeServerMessage.java index 6c579c07f6..a070a87e4c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/LargeServerMessage.java @@ -14,11 +14,11 @@ * 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; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.replication.ReplicatedLargeMessage; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.replication.ReplicatedLargeMessage; public interface LargeServerMessage extends ServerMessage, ReplicatedLargeMessage @@ -46,7 +46,7 @@ public interface LargeServerMessage extends ServerMessage, ReplicatedLargeMessag /** * @return - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ SequentialFile getFile() throws ActiveMQException; } diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/LiveNodeLocator.java similarity index 84% rename from activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/LiveNodeLocator.java index f90f67a8e0..14099f39a2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/LiveNodeLocator.java @@ -14,14 +14,14 @@ * 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; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClusterTopologyListener; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.server.cluster.qourum.SharedNothingBackupQuorum; /** * A class that will locate a particular live server running in a cluster. How this live is chosen diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/MemoryManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MemoryManager.java similarity index 97% rename from activemq-server/src/main/java/org/apache/activemq/core/server/MemoryManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MemoryManager.java index bb3bb7990b..1bfd08d107 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/MemoryManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MemoryManager.java @@ -14,9 +14,9 @@ * 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; -import org.apache.activemq.utils.SizeFormatterUtil; +import org.apache.activemq.artemis.utils.SizeFormatterUtil; /** * A memory usage watcher. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/MessageReference.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.java similarity index 97% rename from activemq-server/src/main/java/org/apache/activemq/core/server/MessageReference.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.java index b2b6c3cf74..274e687a03 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/MessageReference.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.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; /** diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/NodeManager.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/NodeManager.java index 3735ae70de..16e200ffd0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/NodeManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/NodeManager.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; import java.io.File; import java.io.IOException; @@ -22,10 +22,10 @@ import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.utils.UUID; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.utils.UUID; +import org.apache.activemq.artemis.utils.UUIDGenerator; public abstract class NodeManager implements ActiveMQComponent { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/Queue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/server/Queue.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java index 12e29381d0..c840a375b5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/Queue.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java @@ -14,19 +14,19 @@ * 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; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.utils.LinkedListIterator; -import org.apache.activemq.utils.ReferenceCounter; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.utils.LinkedListIterator; +import org.apache.activemq.artemis.utils.ReferenceCounter; public interface Queue extends Bindable { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/QueueCreator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueCreator.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/server/QueueCreator.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueCreator.java index c1c272d132..16e369dc0e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/QueueCreator.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueCreator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.activemq.core.server; +package org.apache.activemq.artemis.core.server; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; public interface QueueCreator { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/QueueFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueFactory.java similarity index 83% rename from activemq-server/src/main/java/org/apache/activemq/core/server/QueueFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueFactory.java index a4225e46d2..77799914d6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/QueueFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueFactory.java @@ -14,12 +14,12 @@ * 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; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.postoffice.PostOffice; /** * diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/RouteContextList.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/RouteContextList.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/server/RouteContextList.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/RouteContextList.java index 91d7e76bb0..925b9efc45 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/RouteContextList.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/RouteContextList.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; import java.util.List; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/RoutingContext.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/RoutingContext.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/server/RoutingContext.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/RoutingContext.java index ff8da62190..359596e294 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/RoutingContext.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/RoutingContext.java @@ -14,13 +14,13 @@ * 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; import java.util.List; import java.util.Map; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.transaction.Transaction; public interface RoutingContext { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ScheduledDeliveryHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ScheduledDeliveryHandler.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ScheduledDeliveryHandler.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ScheduledDeliveryHandler.java index 0d4dee799a..a7187febcb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ScheduledDeliveryHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ScheduledDeliveryHandler.java @@ -14,9 +14,9 @@ * 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; -import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.artemis.core.filter.Filter; import java.util.List; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerConsumer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerConsumer.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ServerConsumer.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerConsumer.java index 52fa1dec7b..19205a7ec4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerConsumer.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerConsumer.java @@ -14,11 +14,11 @@ * 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; import java.util.List; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.Transaction; /** * diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerMessage.java similarity index 87% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ServerMessage.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerMessage.java index dac23f9c20..cb5b1646d6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerMessage.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerMessage.java @@ -14,12 +14,12 @@ * 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; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.paging.PagingStore; /** * diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSession.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ServerSession.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java index b599562e77..c772e4bb2c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSession.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java @@ -14,18 +14,18 @@ * 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; import javax.transaction.xa.Xid; import java.util.List; import java.util.Set; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.utils.json.JSONArray; public interface ServerSession { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSessionFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSessionFactory.java similarity index 65% rename from activemq-server/src/main/java/org/apache/activemq/core/server/ServerSessionFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSessionFactory.java index 4efe63d178..1d823a7ddd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ServerSessionFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSessionFactory.java @@ -14,19 +14,19 @@ * 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; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.security.SecurityStore; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.ServerSessionImpl; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.security.SecurityStore; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; public interface ServerSessionFactory { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/TransientQueueManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/TransientQueueManager.java similarity index 84% rename from activemq-server/src/main/java/org/apache/activemq/core/server/TransientQueueManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/TransientQueueManager.java index b53b4deb56..873b455884 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/TransientQueueManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/TransientQueueManager.java @@ -14,10 +14,10 @@ * 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; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.utils.ReferenceCounter; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.utils.ReferenceCounter; public interface TransientQueueManager extends ReferenceCounter { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java similarity index 79% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java index 395f365a80..7e4f9f5294 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster; +package org.apache.activemq.artemis.core.server.cluster; -import org.apache.activemq.core.protocol.ServerPacketDecoder; -import org.apache.activemq.core.protocol.core.impl.ActiveMQClientProtocolManager; -import org.apache.activemq.core.protocol.core.impl.PacketDecoder; -import org.apache.activemq.spi.core.remoting.ClientProtocolManager; -import org.apache.activemq.spi.core.remoting.ClientProtocolManagerFactory; +import org.apache.activemq.artemis.core.protocol.ServerPacketDecoder; +import org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQClientProtocolManager; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketDecoder; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManagerFactory; /** * A protocol manager that will replace the packet manager for inter-server communications diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BackupManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BackupManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java index 4500684766..68a8f5f597 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BackupManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.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.cluster; +package org.apache.activemq.artemis.core.server.cluster; import java.util.ArrayList; @@ -25,19 +25,19 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.client.impl.ServerLocatorImpl; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.client.impl.Topology; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.utils.ExecutorFactory; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.client.impl.Topology; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.utils.ExecutorFactory; /* * takes care of updating the cluster with a backups transport configuration which is based on each cluster connection. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Bridge.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/Bridge.java similarity index 75% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Bridge.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/Bridge.java index b38919eb7c..f0f3d27831 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Bridge.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/Bridge.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster; +package org.apache.activemq.artemis.core.server.cluster; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.Consumer; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.management.NotificationService; -import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.Consumer; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.management.NotificationService; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; /** * A Core Bridge diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BroadcastGroup.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BroadcastGroup.java similarity index 80% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BroadcastGroup.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BroadcastGroup.java index 53db21010d..e8ad49342f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/BroadcastGroup.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BroadcastGroup.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster; +package org.apache.activemq.artemis.core.server.cluster; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.management.NotificationService; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.management.NotificationService; public interface BroadcastGroup extends ActiveMQComponent { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConfigurationUtil.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterConfigurationUtil.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConfigurationUtil.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterConfigurationUtil.java index 0411219563..0d7a6b0978 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConfigurationUtil.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterConfigurationUtil.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster; +package org.apache.activemq.artemis.core.server.cluster; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; import java.lang.reflect.Array; import java.util.List; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConnection.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterConnection.java similarity index 80% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConnection.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterConnection.java index c8f8ac330b..c89ba2f62b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterConnection.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterConnection.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster; +package org.apache.activemq.artemis.core.server.cluster; import java.util.Map; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClusterTopologyListener; -import org.apache.activemq.core.client.impl.Topology; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQServer; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener; +import org.apache.activemq.artemis.core.client.impl.Topology; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQServer; public interface ClusterConnection extends ActiveMQComponent, ClusterTopologyListener { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterControl.java similarity index 77% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterControl.java index 7cc84fa39c..febcaf84a7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterControl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterControl.java @@ -14,33 +14,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster; +package org.apache.activemq.artemis.core.server.cluster; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.ConfigurationUtils; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.impl.ChannelImpl; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupRegistrationMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupRequestMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupResponseMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterConnectMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.NodeAnnounceMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler; -import org.apache.activemq.core.server.cluster.qourum.Vote; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.ConfigurationUtils; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.impl.ChannelImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupRegistrationMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupRequestMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupResponseMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterConnectMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.NodeAnnounceMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.QuorumVoteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq.artemis.core.server.cluster.qourum.Vote; /** * handles the communication between a cluster node and the cluster, either the whole cluster or a specific node in the @@ -70,7 +70,7 @@ public class ClusterControl implements AutoCloseable * authorise this cluster control so it can communicate with the cluster, it will set the cluster channel on a successful * authentication. * - * @throws org.apache.activemq.api.core.ActiveMQException if authorisation wasn't successful. + * @throws ActiveMQException if authorisation wasn't successful. */ public void authorize() throws ActiveMQException { @@ -93,7 +93,7 @@ public class ClusterControl implements AutoCloseable * @param attemptingFailBack if {@code true} then this server wants to trigger a fail-back when * up-to-date, that is it wants to take over the role of 'live' from the current 'live' * server. - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ public void announceReplicatingBackupToLive(final boolean attemptingFailBack, String replicationClusterName) throws ActiveMQException { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java index abbf9cb15c..89b30a6c36 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterController.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.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.cluster; +package org.apache.activemq.artemis.core.server.cluster; import java.util.HashMap; import java.util.Map; @@ -23,39 +23,39 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClusterTopologyListener; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.client.impl.ServerLocatorImpl; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.client.impl.Topology; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.ChannelHandler; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterConnectMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.NodeAnnounceMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.cluster.qourum.QuorumManager; -import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler; -import org.apache.activemq.core.server.cluster.qourum.Vote; -import org.apache.activemq.core.server.impl.Activation; -import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.client.impl.Topology; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.ChannelHandler; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterConnectMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.NodeAnnounceMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.QuorumVoteMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.cluster.qourum.QuorumManager; +import org.apache.activemq.artemis.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq.artemis.core.server.cluster.qourum.Vote; +import org.apache.activemq.artemis.core.server.impl.Activation; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; /** * used for creating and managing cluster control connections for each cluster connection and the replication connection diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java index a289e42f94..bf515e3d63 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ClusterManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.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.cluster; +package org.apache.activemq.artemis.core.server.cluster; import java.io.PrintWriter; import java.io.StringWriter; @@ -28,50 +28,50 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.BroadcastGroupConfiguration; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.config.BridgeConfiguration; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.filter.impl.FilterImpl; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.cluster.ha.HAManager; -import org.apache.activemq.core.server.cluster.impl.BridgeImpl; -import org.apache.activemq.core.server.cluster.impl.BroadcastGroupImpl; -import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl; -import org.apache.activemq.core.server.cluster.qourum.QuorumManager; -import org.apache.activemq.core.server.impl.Activation; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.ExecutorFactory; -import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.config.BridgeConfiguration; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.filter.impl.FilterImpl; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.cluster.ha.HAManager; +import org.apache.activemq.artemis.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq.artemis.core.server.cluster.impl.BroadcastGroupImpl; +import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq.artemis.core.server.cluster.qourum.QuorumManager; +import org.apache.activemq.artemis.core.server.impl.Activation; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.ExecutorFactory; +import org.apache.activemq.artemis.utils.FutureLatch; /** * A ClusterManager manages {@link ClusterConnection}s, {@link BroadcastGroup}s and {@link Bridge}s. *

- * Note that {@link org.apache.activemq.core.server.cluster.impl.ClusterConnectionBridge}s extend Bridges but are controlled over through - * {@link ClusterConnectionImpl}. As a node is discovered a new {@link org.apache.activemq.core.server.cluster.impl.ClusterConnectionBridge} is + * Note that {@link org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionBridge}s extend Bridges but are controlled over through + * {@link ClusterConnectionImpl}. As a node is discovered a new {@link org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionBridge} is * deployed. */ public final class ClusterManager implements ActiveMQComponent @@ -529,7 +529,8 @@ public final class ClusterManager implements ActiveMQComponent serverLocator.setBlockOnDurableSend(!config.isUseDuplicateDetection()); serverLocator.setBlockOnNonDurableSend(!config.isUseDuplicateDetection()); serverLocator.setMinLargeMessageSize(config.getMinLargeMessageSize()); - serverLocator.setProducerWindowSize(config.getProducerWindowSize()); + //disable flow control + serverLocator.setProducerWindowSize(-1); // This will be set to 30s unless it's changed from embedded / testing // there is no reason to exception the config for this timeout @@ -734,7 +735,6 @@ public final class ClusterManager implements ActiveMQComponent config.isDuplicateDetection(), config.isForwardWhenNoConsumers(), config.getConfirmationWindowSize(), - config.getProducerWindowSize(), executorFactory, server, postOffice, @@ -777,7 +777,6 @@ public final class ClusterManager implements ActiveMQComponent config.isDuplicateDetection(), config.isForwardWhenNoConsumers(), config.getConfirmationWindowSize(), - config.getProducerWindowSize(), executorFactory, server, postOffice, diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/MessageFlowRecord.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/MessageFlowRecord.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/MessageFlowRecord.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/MessageFlowRecord.java index 7ea05ef86f..7eb1be4567 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/MessageFlowRecord.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/MessageFlowRecord.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster; +package org.apache.activemq.artemis.core.server.cluster; -import org.apache.activemq.api.core.client.MessageHandler; +import org.apache.activemq.artemis.api.core.client.MessageHandler; public interface MessageFlowRecord extends MessageHandler { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/RemoteQueueBinding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/RemoteQueueBinding.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/RemoteQueueBinding.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/RemoteQueueBinding.java index e578253f50..516f49ac52 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/RemoteQueueBinding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/RemoteQueueBinding.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster; +package org.apache.activemq.artemis.core.server.cluster; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.postoffice.QueueBinding; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.postoffice.QueueBinding; public interface RemoteQueueBinding extends QueueBinding { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Transformer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/Transformer.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Transformer.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/Transformer.java index 96dfeb48a0..3a324e35f2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/Transformer.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/Transformer.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster; +package org.apache.activemq.artemis.core.server.cluster; -import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; public interface Transformer { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/BackupPolicy.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/BackupPolicy.java index f51bb0e50f..42ff68bacd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/BackupPolicy.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.server.impl.Activation; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.server.impl.Activation; public abstract class BackupPolicy implements HAPolicy { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedHAManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedHAManager.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedHAManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedHAManager.java index 773d2d8a63..e999edb97c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedHAManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedHAManager.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.server.ActivationParams; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.cluster.ClusterControl; -import org.apache.activemq.core.server.cluster.ClusterController; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.server.ActivationParams; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.cluster.ClusterControl; +import org.apache.activemq.artemis.core.server.cluster.ClusterController; import java.util.HashMap; import java.util.List; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedPolicy.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedPolicy.java index 36c0a23d61..2d94c3c9e5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ColocatedPolicy.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.server.impl.ColocatedActivation; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.LiveActivation; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.server.impl.ColocatedActivation; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.LiveActivation; import java.util.ArrayList; import java.util.List; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/HAManager.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/HAManager.java index 2db6d8c972..f6980adbe9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/HAManager.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQServer; import java.util.Map; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAPolicy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/HAPolicy.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAPolicy.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/HAPolicy.java index 4f7bff8f9f..2264f8d46f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/HAPolicy.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/HAPolicy.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; import java.util.Map; -import org.apache.activemq.core.server.impl.Activation; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.Activation; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; /** * Every live server will have an HAPolicy that configures the type of server that it should be either live, backup or diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/LiveOnlyPolicy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/LiveOnlyPolicy.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/LiveOnlyPolicy.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/LiveOnlyPolicy.java index ba489080ee..b6b7af91cc 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/LiveOnlyPolicy.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/LiveOnlyPolicy.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; -import org.apache.activemq.core.server.impl.Activation; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.LiveOnlyActivation; +import org.apache.activemq.artemis.core.server.impl.Activation; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.LiveOnlyActivation; import java.util.Map; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ReplicaPolicy.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ReplicaPolicy.java index 46e3489d29..ee7d34c04e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ReplicaPolicy.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.server.impl.Activation; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.server.impl.Activation; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.SharedNothingBackupActivation; import java.util.Map; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ReplicatedPolicy.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ReplicatedPolicy.java index 101ba89ca0..4cb4623df4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ReplicatedPolicy.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.LiveActivation; -import org.apache.activemq.core.server.impl.SharedNothingLiveActivation; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.LiveActivation; +import org.apache.activemq.artemis.core.server.impl.SharedNothingLiveActivation; import java.util.Map; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ScaleDownPolicy.java similarity index 87% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ScaleDownPolicy.java index 20997765d5..ce86016a70 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ScaleDownPolicy.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/ScaleDownPolicy.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; import java.lang.reflect.Array; import java.util.ArrayList; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/SharedStoreMasterPolicy.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/SharedStoreMasterPolicy.java index 3dc7223da6..2f2911de28 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/SharedStoreMasterPolicy.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.LiveActivation; -import org.apache.activemq.core.server.impl.SharedStoreLiveActivation; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.LiveActivation; +import org.apache.activemq.artemis.core.server.impl.SharedStoreLiveActivation; import java.util.Map; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/SharedStoreSlavePolicy.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/SharedStoreSlavePolicy.java index 6bd78c8c81..369edf6e69 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/SharedStoreSlavePolicy.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.server.impl.Activation; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.SharedStoreBackupActivation; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.server.impl.Activation; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.SharedStoreBackupActivation; import java.util.Map; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/StandaloneHAManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/StandaloneHAManager.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/StandaloneHAManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/StandaloneHAManager.java index 2b1e031052..eb04d60f1a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/StandaloneHAManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ha/StandaloneHAManager.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.ha; +package org.apache.activemq.artemis.core.server.cluster.ha; -import org.apache.activemq.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServer; import java.util.HashMap; import java.util.Map; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java index 0f7ef6be78..1235248fc1 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BridgeImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.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.cluster.impl; +package org.apache.activemq.artemis.core.server.cluster.impl; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -26,41 +26,41 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClusterTopologyListener; -import org.apache.activemq.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq.api.core.client.SessionFailureListener; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.client.impl.ClientSessionInternal; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.HandleStatus; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.Bridge; -import org.apache.activemq.core.server.cluster.Transformer; -import org.apache.activemq.core.server.impl.QueueImpl; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.server.management.NotificationService; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.utils.FutureLatch; -import org.apache.activemq.utils.ReusableLatch; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.UUID; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener; +import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.artemis.api.core.client.SessionFailureListener; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.HandleStatus; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.Bridge; +import org.apache.activemq.artemis.core.server.cluster.Transformer; +import org.apache.activemq.artemis.core.server.impl.QueueImpl; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.server.management.NotificationService; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.utils.FutureLatch; +import org.apache.activemq.artemis.utils.ReusableLatch; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.UUID; /** * A Core BridgeImpl @@ -221,7 +221,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled } /* (non-Javadoc) - * @see org.apache.activemq.core.server.Consumer#getDeliveringMessages() + * @see org.apache.activemq.artemis.core.server.Consumer#getDeliveringMessages() */ @Override public List getDeliveringMessages() diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BroadcastGroupImpl.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BroadcastGroupImpl.java index 69c8b6bbee..e276b9d2ee 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/BroadcastGroupImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BroadcastGroupImpl.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.cluster.impl; +package org.apache.activemq.artemis.core.server.cluster.impl; import java.util.ArrayList; import java.util.List; @@ -22,20 +22,20 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.BroadcastEndpoint; -import org.apache.activemq.api.core.BroadcastEndpointFactory; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.cluster.BroadcastGroup; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.server.management.NotificationService; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.BroadcastEndpoint; +import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.cluster.BroadcastGroup; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.server.management.NotificationService; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.UUIDGenerator; /** *

This class will use the {@link BroadcastEndpoint} to send periodical updates on the list for connections diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java index ec4fcc90e4..3c007b5709 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionBridge.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.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.cluster.impl; +package org.apache.activemq.artemis.core.server.cluster.impl; import java.util.ArrayList; import java.util.HashSet; @@ -23,32 +23,32 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.api.core.management.ResourceNames; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.server.cluster.ClusterManager; -import org.apache.activemq.core.server.cluster.ActiveMQServerSideProtocolManagerFactory; -import org.apache.activemq.core.server.cluster.MessageFlowRecord; -import org.apache.activemq.core.server.cluster.Transformer; -import org.apache.activemq.utils.UUID; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.api.core.management.ResourceNames; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.server.cluster.ClusterManager; +import org.apache.activemq.artemis.core.server.cluster.ActiveMQServerSideProtocolManagerFactory; +import org.apache.activemq.artemis.core.server.cluster.MessageFlowRecord; +import org.apache.activemq.artemis.core.server.cluster.Transformer; +import org.apache.activemq.artemis.utils.UUID; +import org.apache.activemq.artemis.utils.UUIDGenerator; /** * A bridge with extra functionality only available when the server is clustered. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java index c02ed572e4..43c7e45a5c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/ClusterConnectionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.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.cluster.impl; +package org.apache.activemq.artemis.core.server.cluster.impl; import java.io.PrintWriter; import java.io.StringWriter; @@ -29,47 +29,47 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClusterTopologyListener; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.core.client.impl.AfterConnectInternalListener; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.client.impl.ServerLocatorImpl; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.client.impl.Topology; -import org.apache.activemq.core.client.impl.TopologyMemberImpl; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.impl.PostOfficeImpl; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.cluster.Bridge; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.server.cluster.ClusterControl; -import org.apache.activemq.core.server.cluster.ClusterManager; -import org.apache.activemq.core.server.cluster.ClusterManager.IncomingInterceptorLookingForExceptionMessage; -import org.apache.activemq.core.server.cluster.ActiveMQServerSideProtocolManagerFactory; -import org.apache.activemq.core.server.cluster.MessageFlowRecord; -import org.apache.activemq.core.server.cluster.RemoteQueueBinding; -import org.apache.activemq.core.server.group.impl.Proposal; -import org.apache.activemq.core.server.group.impl.Response; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.utils.ExecutorFactory; -import org.apache.activemq.utils.FutureLatch; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.core.client.impl.AfterConnectInternalListener; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.client.impl.Topology; +import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.Bindings; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.cluster.Bridge; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.server.cluster.ClusterControl; +import org.apache.activemq.artemis.core.server.cluster.ClusterManager; +import org.apache.activemq.artemis.core.server.cluster.ClusterManager.IncomingInterceptorLookingForExceptionMessage; +import org.apache.activemq.artemis.core.server.cluster.ActiveMQServerSideProtocolManagerFactory; +import org.apache.activemq.artemis.core.server.cluster.MessageFlowRecord; +import org.apache.activemq.artemis.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq.artemis.core.server.group.impl.Proposal; +import org.apache.activemq.artemis.core.server.group.impl.Response; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.utils.ExecutorFactory; +import org.apache.activemq.artemis.utils.FutureLatch; +import org.apache.activemq.artemis.utils.TypedProperties; public final class ClusterConnectionImpl implements ClusterConnection, AfterConnectInternalListener { @@ -113,8 +113,6 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn private final int confirmationWindowSize; - private final int producerWindowSize; - /** * Guard for the field {@link #records}. Note that the field is {@link ConcurrentHashMap}, * however we need the guard to synchronize multiple step operations during topology updates. @@ -181,7 +179,6 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn final boolean useDuplicateDetection, final boolean routeWhenNoConsumers, final int confirmationWindowSize, - final int producerWindowSize, final ExecutorFactory executorFactory, final ActiveMQServer server, final PostOffice postOffice, @@ -223,8 +220,6 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn this.confirmationWindowSize = confirmationWindowSize; - this.producerWindowSize = producerWindowSize; - this.executorFactory = executorFactory; this.clusterNotificationInterval = clusterNotificationInterval; @@ -291,7 +286,6 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn final boolean useDuplicateDetection, final boolean routeWhenNoConsumers, final int confirmationWindowSize, - final int producerWindowSize, final ExecutorFactory executorFactory, final ActiveMQServer server, final PostOffice postOffice, @@ -339,8 +333,6 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn this.confirmationWindowSize = confirmationWindowSize; - this.producerWindowSize = producerWindowSize; - this.executorFactory = executorFactory; this.clusterNotificationInterval = clusterNotificationInterval; @@ -645,7 +637,8 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn serverLocator.setBlockOnNonDurableSend(!useDuplicateDetection); serverLocator.setCallTimeout(callTimeout); serverLocator.setCallFailoverTimeout(callFailoverTimeout); - serverLocator.setProducerWindowSize(producerWindowSize); + // No producer flow control on the bridges, as we don't want to lock the queues + serverLocator.setProducerWindowSize(-1); if (retryInterval > 0) { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/Redistributor.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/Redistributor.java index 6e07984a4a..24510c40bf 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/Redistributor.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/Redistributor.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.impl; +package org.apache.activemq.artemis.core.server.cluster.impl; import java.util.Collections; import java.util.List; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.server.Consumer; -import org.apache.activemq.core.server.HandleStatus; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.impl.TransactionImpl; -import org.apache.activemq.utils.ReusableLatch; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.Consumer; +import org.apache.activemq.artemis.core.server.HandleStatus; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.utils.ReusableLatch; public class Redistributor implements Consumer { @@ -295,7 +295,7 @@ public class Redistributor implements Consumer } /* (non-Javadoc) - * @see org.apache.activemq.core.server.Consumer#getDeliveringMessages() + * @see org.apache.activemq.artemis.core.server.Consumer#getDeliveringMessages() */ @Override public List getDeliveringMessages() diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/RemoteQueueBindingImpl.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/RemoteQueueBindingImpl.java index e31fbcf716..171bce0b23 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/impl/RemoteQueueBindingImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/RemoteQueueBindingImpl.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.cluster.impl; +package org.apache.activemq.artemis.core.server.cluster.impl; import java.nio.ByteBuffer; import java.util.HashMap; @@ -23,17 +23,17 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.filter.impl.FilterImpl; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.server.Bindable; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.filter.impl.FilterImpl; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.server.Bindable; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.RemoteQueueBinding; public class RemoteQueueBindingImpl implements RemoteQueueBinding { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/BooleanVote.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/BooleanVote.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/BooleanVote.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/BooleanVote.java index f79fef86b1..0848da75bb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/BooleanVote.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/BooleanVote.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.qourum; +package org.apache.activemq.artemis.core.server.cluster.qourum; -import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import java.util.Map; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Quorum.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/Quorum.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Quorum.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/Quorum.java index 8d01566ed1..045971e582 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Quorum.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/Quorum.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.qourum; +package org.apache.activemq.artemis.core.server.cluster.qourum; -import org.apache.activemq.core.client.impl.Topology; +import org.apache.activemq.artemis.core.client.impl.Topology; /** * A quorum can be registered with the {@link QuorumManager} to receive notifications about the state of a cluster. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java index 09f05850c7..12a8e6bdfd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.qourum; +package org.apache.activemq.artemis.core.server.cluster.qourum; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutorService; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClusterTopologyListener; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.core.client.impl.TopologyMemberImpl; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.cluster.ClusterControl; -import org.apache.activemq.core.server.cluster.ClusterController; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.cluster.ClusterControl; +import org.apache.activemq.artemis.core.server.cluster.ClusterController; /** - * A QourumManager can be used to register a {@link org.apache.activemq.core.server.cluster.qourum.Quorum} to receive notifications - * about changes to the cluster. A {@link org.apache.activemq.core.server.cluster.qourum.Quorum} can then issue a vote to the + * A QourumManager can be used to register a {@link org.apache.activemq.artemis.core.server.cluster.qourum.Quorum} to receive notifications + * about changes to the cluster. A {@link org.apache.activemq.artemis.core.server.cluster.qourum.Quorum} can then issue a vote to the * remaining nodes in a cluster for a specific outcome */ public final class QuorumManager implements ClusterTopologyListener, ActiveMQComponent @@ -43,7 +43,7 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom private final ClusterController clusterController; /** - * all the current registered {@link org.apache.activemq.core.server.cluster.qourum.Quorum}'s + * all the current registered {@link org.apache.activemq.artemis.core.server.cluster.qourum.Quorum}'s */ private Map quorums = new HashMap<>(); @@ -117,7 +117,7 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom } /** - * registers a {@link org.apache.activemq.core.server.cluster.qourum.Quorum} so that it can be notified of changes in the cluster. + * registers a {@link org.apache.activemq.artemis.core.server.cluster.qourum.Quorum} so that it can be notified of changes in the cluster. * @param quorum */ public void registerQuorum(Quorum quorum) @@ -127,7 +127,7 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom } /** - * unregisters a {@link org.apache.activemq.core.server.cluster.qourum.Quorum}. + * unregisters a {@link org.apache.activemq.artemis.core.server.cluster.qourum.Quorum}. * @param quorum */ public void unRegisterQuorum(Quorum quorum) @@ -136,8 +136,8 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom } /** - * called by the {@link org.apache.activemq.core.client.impl.ServerLocatorInternal} when the topology changes. we update the - * {@code maxClusterSize} if needed and inform the {@link org.apache.activemq.core.server.cluster.qourum.Quorum}'s. + * called by the {@link org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal} when the topology changes. we update the + * {@code maxClusterSize} if needed and inform the {@link org.apache.activemq.artemis.core.server.cluster.qourum.Quorum}'s. * * @param topologyMember the topolgy changed * @param last if the whole cluster topology is being transmitted (after adding the listener to @@ -155,7 +155,7 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom } /** - * notify the {@link org.apache.activemq.core.server.cluster.qourum.Quorum} of a topology change. + * notify the {@link org.apache.activemq.artemis.core.server.cluster.qourum.Quorum} of a topology change. * @param eventUID * @param nodeID the id of the node leaving the cluster */ @@ -296,7 +296,7 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom } /** * this will connect to a node and then cast a vote. whether or not this vote is asked of the target node is dependant - * on {@link org.apache.activemq.core.server.cluster.qourum.Vote#isRequestServerVote()} + * on {@link org.apache.activemq.artemis.core.server.cluster.qourum.Vote#isRequestServerVote()} */ private final class VoteRunnable implements Runnable { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVote.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVote.java similarity index 71% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVote.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVote.java index 31f2748f1c..c396420fac 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVote.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVote.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.qourum; +package org.apache.activemq.artemis.core.server.cluster.qourum; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.impl.Topology; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.client.impl.Topology; /** * the vote itself. the vote can be decided by the enquirer or sent out to each node in the quorum. @@ -32,7 +32,7 @@ public abstract class QuorumVote } /** - * called by the {@link org.apache.activemq.core.server.cluster.qourum.QuorumManager} when one of teh nodes in the quorum is + * called by the {@link org.apache.activemq.artemis.core.server.cluster.qourum.QuorumManager} when one of teh nodes in the quorum is * successfully connected to. The QuorumVote can then decide whether or not a decision can be made with just that information. * * @return the vote to use @@ -40,7 +40,7 @@ public abstract class QuorumVote public abstract Vote connected(); /** - * called by the {@link org.apache.activemq.core.server.cluster.qourum.QuorumManager} fails to connect to a node in the quorum. + * called by the {@link org.apache.activemq.artemis.core.server.cluster.qourum.QuorumManager} fails to connect to a node in the quorum. * The QuorumVote can then decide whether or not a decision can be made with just that information however the node * cannot cannot be asked. * @return the vote to use @@ -48,7 +48,7 @@ public abstract class QuorumVote public abstract Vote notConnected(); /** - * called by the {@link org.apache.activemq.core.server.cluster.qourum.QuorumManager} when a vote can be made, either from the + * called by the {@link org.apache.activemq.artemis.core.server.cluster.qourum.QuorumManager} when a vote can be made, either from the * cluster or decided by itself. * * @param vote the vote to make. @@ -63,14 +63,14 @@ public abstract class QuorumVote public abstract T getDecision(); /** - * called by the {@link org.apache.activemq.core.server.cluster.qourum.QuorumManager} when all the votes have been cast and received. + * called by the {@link org.apache.activemq.artemis.core.server.cluster.qourum.QuorumManager} when all the votes have been cast and received. * * @param voteTopology the topology of where the votes were sent. */ public abstract void allVotesCast(Topology voteTopology); /** - * the name of this quorum vote, used for identifying the correct {@link org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler} + * the name of this quorum vote, used for identifying the correct {@link org.apache.activemq.artemis.core.server.cluster.qourum.QuorumVoteHandler} * * @return the name of the wuorum vote */ diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVoteHandler.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteHandler.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVoteHandler.java index 0471c5fd3c..f113f448f5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVoteHandler.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.qourum; +package org.apache.activemq.artemis.core.server.cluster.qourum; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; /** * used to handle votes received by a quorum from a particular node diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteServerConnect.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVoteServerConnect.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteServerConnect.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVoteServerConnect.java index faa1de19e3..5dcf3a1c8e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/QuorumVoteServerConnect.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVoteServerConnect.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.qourum; +package org.apache.activemq.artemis.core.server.cluster.qourum; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.impl.Topology; -import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.client.impl.Topology; +import org.apache.activemq.artemis.core.persistence.StorageManager; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java similarity index 87% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java index 967a5519b8..ca7326dade 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/SharedNothingBackupQuorum.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.qourum; +package org.apache.activemq.artemis.core.server.cluster.qourum; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.client.impl.Topology; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.client.impl.Topology; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.NodeManager; public class SharedNothingBackupQuorum implements Quorum, FailureListener { @@ -55,8 +55,8 @@ public class SharedNothingBackupQuorum implements Quorum, FailureListener /** * This is a safety net in case the live sends the first {@link ReplicationLiveIsStoppingMessage} - * with code {@link org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#STOP_CALLED} and crashes before sending the second with - * {@link org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#FAIL_OVER}. + * with code {@link org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#STOP_CALLED} and crashes before sending the second with + * {@link org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#FAIL_OVER}. *

* If the second message does come within this dead line, we fail over anyway. */ diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Vote.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/Vote.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Vote.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/Vote.java index 9e555192d1..b3419e772f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/qourum/Vote.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/Vote.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.cluster.qourum; +package org.apache.activemq.artemis.core.server.cluster.qourum; -import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import java.util.HashMap; import java.util.Map; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedActiveMQ.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java similarity index 84% rename from activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedActiveMQ.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java index 4290848dbc..8e618a3f51 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedActiveMQ.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.embedded; +package org.apache.activemq.artemis.core.server.embedded; import javax.management.MBeanServer; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.FileDeploymentManager; -import org.apache.activemq.core.config.impl.FileConfiguration; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.FileDeploymentManager; +import org.apache.activemq.artemis.core.config.impl.FileConfiguration; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl; /** * Helper class to simplify bootstrap of ActiveMQ server. Bootstraps from classpath-based config files. @@ -48,7 +48,7 @@ public class EmbeddedActiveMQ } /** - * Set the activemq security manager. This defaults to org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl + * Set the activemq security manager. This defaults to org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl * * @param securityManager */ diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/GroupingHandler.java similarity index 80% rename from activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/GroupingHandler.java index 7e44eb7834..7b4044a2f6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/GroupingHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/GroupingHandler.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.group; +package org.apache.activemq.artemis.core.server.group; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.group.impl.GroupBinding; -import org.apache.activemq.core.server.group.impl.Proposal; -import org.apache.activemq.core.server.group.impl.Response; -import org.apache.activemq.core.server.management.NotificationListener; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.group.impl.GroupBinding; +import org.apache.activemq.artemis.core.server.group.impl.Proposal; +import org.apache.activemq.artemis.core.server.group.impl.Response; +import org.apache.activemq.artemis.core.server.management.NotificationListener; public interface GroupingHandler extends NotificationListener, ActiveMQComponent { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/UnproposalListener.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/UnproposalListener.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/server/group/UnproposalListener.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/UnproposalListener.java index 9e48196591..6892de5fdb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/UnproposalListener.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/UnproposalListener.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.group; +package org.apache.activemq.artemis.core.server.group; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; public interface UnproposalListener { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupBinding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupBinding.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupBinding.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupBinding.java index fdb4d13300..3da4dcef51 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupBinding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupBinding.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.group.impl; +package org.apache.activemq.artemis.core.server.group.impl; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; /** * A group binding diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupHandlingAbstract.java similarity index 82% rename from activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupHandlingAbstract.java index 96232c98f1..d294025ac3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupHandlingAbstract.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupHandlingAbstract.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.group.impl; +package org.apache.activemq.artemis.core.server.group.impl; import java.util.Collections; import java.util.Set; import java.util.WeakHashMap; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.group.GroupingHandler; -import org.apache.activemq.core.server.group.UnproposalListener; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.group.GroupingHandler; +import org.apache.activemq.artemis.core.server.group.UnproposalListener; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.utils.TypedProperties; public abstract class GroupHandlingAbstract implements GroupingHandler { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupingHandlerConfiguration.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupingHandlerConfiguration.java index ebddb2bff3..2fa134e37e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupingHandlerConfiguration.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.group.impl; +package org.apache.activemq.artemis.core.server.group.impl; import java.io.Serializable; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.api.core.SimpleString; /** * A remote Grouping handler configuration diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.java index 31915d820c..6cfbb520bf 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/LocalGroupingHandler.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.group.impl; +package org.apache.activemq.artemis.core.server.group.impl; import java.util.ArrayList; import java.util.Collections; @@ -29,17 +29,17 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.utils.ExecutorFactory; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.utils.ExecutorFactory; +import org.apache.activemq.artemis.utils.TypedProperties; /** * A Local Grouping handler. All the Remote handlers will talk with us diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/Proposal.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/Proposal.java index c01d0d67c9..2d97b2706e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/Proposal.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.group.impl; +package org.apache.activemq.artemis.core.server.group.impl; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; /** * A proposal to select a group id diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/RemoteGroupingHandler.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/RemoteGroupingHandler.java index d52d033b62..0b988ea170 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/RemoteGroupingHandler.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.group.impl; +package org.apache.activemq.artemis.core.server.group.impl; import java.util.ArrayList; import java.util.List; @@ -26,17 +26,17 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.ExecutorFactory; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.ExecutorFactory; +import org.apache.activemq.artemis.utils.TypedProperties; /** * A remote Grouping handler. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/Response.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/Response.java index 402a2db242..1a24cbc8bc 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/Response.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.group.impl; +package org.apache.activemq.artemis.core.server.group.impl; -import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.SimpleString; /** * A response to a proposal diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java index eff26342df..b5bd9272a7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; import java.io.File; import java.io.IOException; import java.nio.channels.FileLock; -import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; /** * This is using the ActiveMQ Libaio Native to perform calls to flock on a Linux system. At the diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/Activation.java similarity index 73% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/Activation.java index 4f9d1a60ba..cc8e2b2828 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/Activation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/Activation.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.ChannelHandler; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.QueueFactory; -import org.apache.activemq.core.server.cluster.ha.HAManager; -import org.apache.activemq.core.server.cluster.ha.StandaloneHAManager; -import org.apache.activemq.core.server.group.GroupingHandler; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.ChannelHandler; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.replication.ReplicationManager; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.core.server.cluster.ha.HAManager; +import org.apache.activemq.artemis.core.server.cluster.ha.StandaloneHAManager; +import org.apache.activemq.artemis.core.server.group.GroupingHandler; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; /** * An activation controls the lifecycle of the server and any components specific to the Activation itself. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java index 4efb8f721d..7eb5c13539 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.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.impl; +package org.apache.activemq.artemis.core.server.impl; import javax.management.MBeanServer; @@ -41,96 +41,96 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq.core.config.BridgeConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.ConfigurationUtils; -import org.apache.activemq.core.config.CoreQueueConfiguration; -import org.apache.activemq.core.config.DivertConfiguration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.filter.impl.FilterImpl; -import org.apache.activemq.core.journal.IOCriticalErrorListener; -import org.apache.activemq.core.journal.JournalLoadInformation; -import org.apache.activemq.core.journal.SequentialFile; -import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; -import org.apache.activemq.core.journal.impl.SyncSpeedTest; -import org.apache.activemq.core.management.impl.ActiveMQServerControlImpl; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.paging.impl.PagingManagerImpl; -import org.apache.activemq.core.paging.impl.PagingStoreFactoryNIO; -import org.apache.activemq.core.persistence.GroupingInfo; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.persistence.QueueBindingInfo; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.persistence.config.PersistedAddressSetting; -import org.apache.activemq.core.persistence.config.PersistedRoles; -import org.apache.activemq.core.persistence.impl.PageCountPending; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager; -import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl; -import org.apache.activemq.core.persistence.impl.nullpm.NullStorageManager; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.QueueBinding; -import org.apache.activemq.core.postoffice.impl.DivertBinding; -import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq.core.postoffice.impl.PostOfficeImpl; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.remoting.server.impl.RemotingServiceImpl; -import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.security.CheckType; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.security.SecurityStore; -import org.apache.activemq.core.security.impl.SecurityStoreImpl; -import org.apache.activemq.core.server.ActivateCallback; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.Bindable; -import org.apache.activemq.core.server.Divert; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.MemoryManager; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.QueueCreator; -import org.apache.activemq.core.server.QueueFactory; -import org.apache.activemq.core.server.ServerSession; -import org.apache.activemq.core.server.ServerSessionFactory; -import org.apache.activemq.core.server.cluster.BackupManager; -import org.apache.activemq.core.server.cluster.ClusterManager; -import org.apache.activemq.core.server.cluster.Transformer; -import org.apache.activemq.core.server.cluster.ha.HAPolicy; -import org.apache.activemq.core.server.group.GroupingHandler; -import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration; -import org.apache.activemq.core.server.group.impl.LocalGroupingHandler; -import org.apache.activemq.core.server.group.impl.RemoteGroupingHandler; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.impl.ManagementServiceImpl; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.impl.ResourceManagerImpl; -import org.apache.activemq.core.version.Version; -import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.protocol.SessionCallback; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.utils.ClassloadingUtil; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.ExecutorFactory; -import org.apache.activemq.utils.ActiveMQThreadFactory; -import org.apache.activemq.utils.OrderedExecutorFactory; -import org.apache.activemq.utils.ReusableLatch; -import org.apache.activemq.utils.SecurityFormatter; -import org.apache.activemq.utils.VersionLoader; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.artemis.core.config.BridgeConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.ConfigurationUtils; +import org.apache.activemq.artemis.core.config.CoreQueueConfiguration; +import org.apache.activemq.artemis.core.config.DivertConfiguration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.filter.impl.FilterImpl; +import org.apache.activemq.artemis.core.journal.IOCriticalErrorListener; +import org.apache.activemq.artemis.core.journal.JournalLoadInformation; +import org.apache.activemq.artemis.core.journal.SequentialFile; +import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.SyncSpeedTest; +import org.apache.activemq.artemis.core.management.impl.ActiveMQServerControlImpl; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.paging.impl.PagingManagerImpl; +import org.apache.activemq.artemis.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq.artemis.core.persistence.GroupingInfo; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.persistence.QueueBindingInfo; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq.artemis.core.persistence.config.PersistedRoles; +import org.apache.activemq.artemis.core.persistence.impl.PageCountPending; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.QueueBinding; +import org.apache.activemq.artemis.core.postoffice.impl.DivertBinding; +import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.remoting.server.impl.RemotingServiceImpl; +import org.apache.activemq.artemis.core.replication.ReplicationManager; +import org.apache.activemq.artemis.core.security.CheckType; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.security.SecurityStore; +import org.apache.activemq.artemis.core.security.impl.SecurityStoreImpl; +import org.apache.activemq.artemis.core.server.ActivateCallback; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.Bindable; +import org.apache.activemq.artemis.core.server.Divert; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.MemoryManager; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.QueueCreator; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.core.server.ServerSession; +import org.apache.activemq.artemis.core.server.ServerSessionFactory; +import org.apache.activemq.artemis.core.server.cluster.BackupManager; +import org.apache.activemq.artemis.core.server.cluster.ClusterManager; +import org.apache.activemq.artemis.core.server.cluster.Transformer; +import org.apache.activemq.artemis.core.server.cluster.ha.HAPolicy; +import org.apache.activemq.artemis.core.server.group.GroupingHandler; +import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq.artemis.core.server.group.impl.LocalGroupingHandler; +import org.apache.activemq.artemis.core.server.group.impl.RemoteGroupingHandler; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.impl.ManagementServiceImpl; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.impl.ResourceManagerImpl; +import org.apache.activemq.artemis.core.version.Version; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.utils.ClassloadingUtil; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.ExecutorFactory; +import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; +import org.apache.activemq.artemis.utils.OrderedExecutorFactory; +import org.apache.activemq.artemis.utils.ReusableLatch; +import org.apache.activemq.artemis.utils.SecurityFormatter; +import org.apache.activemq.artemis.utils.VersionLoader; /** * The ActiveMQ server implementation diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AnyLiveNodeLocatorForReplication.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AnyLiveNodeLocatorForReplication.java index a00c925fc2..a720026f2a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AnyLiveNodeLocatorForReplication.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.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.HashMap; import java.util.Iterator; @@ -24,12 +24,12 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.core.server.LiveNodeLocator; -import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.core.server.LiveNodeLocator; +import org.apache.activemq.artemis.core.server.cluster.qourum.SharedNothingBackupQuorum; /** * This implementation looks for any available live node, once tried with no success it is marked as diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AnyLiveNodeLocatorForScaleDown.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AnyLiveNodeLocatorForScaleDown.java index f7f804afbd..5d389787b0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AnyLiveNodeLocatorForScaleDown.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.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.Iterator; import java.util.Map; @@ -24,12 +24,12 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.LiveNodeLocator; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.LiveNodeLocator; /** * This implementation looks for any available live node, once tried with no success it is marked as diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AutoCreatedQueueManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/AutoCreatedQueueManagerImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java index 3592bb97e8..d9f58b7337 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AutoCreatedQueueManagerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.AutoCreatedQueueManager; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.utils.ReferenceCounterUtil; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.AutoCreatedQueueManager; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.utils.ReferenceCounterUtil; public class AutoCreatedQueueManagerImpl implements AutoCreatedQueueManager { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupRecoveryJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/BackupRecoveryJournalLoader.java similarity index 73% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupRecoveryJournalLoader.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/BackupRecoveryJournalLoader.java index 39b34df39a..87ce5afdad 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupRecoveryJournalLoader.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/BackupRecoveryJournalLoader.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.persistence.GroupingInfo; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.QueueFactory; -import org.apache.activemq.core.server.cluster.ClusterController; -import org.apache.activemq.core.server.cluster.ActiveMQServerSideProtocolManagerFactory; -import org.apache.activemq.core.server.group.GroupingHandler; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.persistence.GroupingInfo; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.core.server.cluster.ClusterController; +import org.apache.activemq.artemis.core.server.cluster.ActiveMQServerSideProtocolManagerFactory; +import org.apache.activemq.artemis.core.server.group.GroupingHandler; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.transaction.ResourceManager; import java.util.List; import java.util.Map; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupTopologyListener.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/BackupTopologyListener.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupTopologyListener.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/BackupTopologyListener.java index 689b42ce61..69d22c817e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/BackupTopologyListener.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/BackupTopologyListener.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.client.ClusterTopologyListener; -import org.apache.activemq.api.core.client.TopologyMember; +import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener; +import org.apache.activemq.artemis.api.core.client.TopologyMember; final class BackupTopologyListener implements ClusterTopologyListener { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ColocatedActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ColocatedActivation.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/ColocatedActivation.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ColocatedActivation.java index 50826410f1..994c8911b5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ColocatedActivation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ColocatedActivation.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.impl.Topology; -import org.apache.activemq.core.client.impl.TopologyMemberImpl; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.ChannelHandler; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupRequestMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupResponseMessage; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.cluster.ha.ColocatedHAManager; -import org.apache.activemq.core.server.cluster.ha.ColocatedPolicy; -import org.apache.activemq.core.server.cluster.ha.HAManager; -import org.apache.activemq.core.server.cluster.qourum.QuorumVote; -import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler; -import org.apache.activemq.core.server.cluster.qourum.Vote; -import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.client.impl.Topology; +import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.ChannelHandler; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupRequestMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupResponseMessage; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.replication.ReplicationManager; +import org.apache.activemq.artemis.core.server.cluster.ha.ColocatedHAManager; +import org.apache.activemq.artemis.core.server.cluster.ha.ColocatedPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.HAManager; +import org.apache.activemq.artemis.core.server.cluster.qourum.QuorumVote; +import org.apache.activemq.artemis.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq.artemis.core.server.cluster.qourum.Vote; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; import java.util.ArrayList; import java.util.Collections; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.java index b51c896dbf..ce633aea1e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.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.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.Collection; import java.util.HashSet; @@ -22,17 +22,17 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.ConnectorServiceConfiguration; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ConnectorService; -import org.apache.activemq.core.server.ConnectorServiceFactory; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.utils.ClassloadingUtil; -import org.apache.activemq.utils.ConfigurationHelper; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ConnectorService; +import org.apache.activemq.artemis.core.server.ConnectorServiceFactory; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.utils.ClassloadingUtil; +import org.apache.activemq.artemis.utils.ConfigurationHelper; /** * ConnectorsService will pool some resource for updates, e.g. Twitter, then the changes are picked diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/DivertImpl.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/DivertImpl.java index b080351daf..d9d0ead735 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/DivertImpl.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.Divert; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.Transformer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.Divert; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.Transformer; /** * A DivertImpl simply diverts a message to a different forwardAddress diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java index d4f7e64de6..a8864e8bcd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.FileLock; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.utils.UUID; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.utils.UUID; public class FileLockNodeManager extends NodeManager { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java similarity index 81% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java index d69971273e..71543aa66b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import static org.apache.activemq.core.server.impl.InVMNodeManager.State.LIVE; -import static org.apache.activemq.core.server.impl.InVMNodeManager.State.FAILING_BACK; -import static org.apache.activemq.core.server.impl.InVMNodeManager.State.NOT_STARTED; -import static org.apache.activemq.core.server.impl.InVMNodeManager.State.PAUSED; +import static org.apache.activemq.artemis.core.server.impl.InVMNodeManager.State.LIVE; +import static org.apache.activemq.artemis.core.server.impl.InVMNodeManager.State.FAILING_BACK; +import static org.apache.activemq.artemis.core.server.impl.InVMNodeManager.State.NOT_STARTED; +import static org.apache.activemq.artemis.core.server.impl.InVMNodeManager.State.PAUSED; import java.io.IOException; import java.util.concurrent.Semaphore; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.utils.UUIDGenerator; /** * NodeManager used to run multiple servers in the same VM. *

- * We use the {@link org.apache.activemq.core.server.impl.InVMNodeManager} instead of {@link org.apache.activemq.core.server.impl.FileLockNodeManager} when + * We use the {@link org.apache.activemq.artemis.core.server.impl.InVMNodeManager} instead of {@link org.apache.activemq.artemis.core.server.impl.FileLockNodeManager} when * multiple servers are run inside the same VM and File Locks can not be shared in the * same VM (it would cause a shared lock violation). */ diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/JournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/JournalLoader.java similarity index 72% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/JournalLoader.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/JournalLoader.java index 632768f113..8522b11f1f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/JournalLoader.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/JournalLoader.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; import javax.transaction.xa.Xid; import java.util.List; import java.util.Map; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.persistence.GroupingInfo; -import org.apache.activemq.core.persistence.QueueBindingInfo; -import org.apache.activemq.core.persistence.impl.PageCountPending; -import org.apache.activemq.core.persistence.impl.journal.AddMessageRecord; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.persistence.GroupingInfo; +import org.apache.activemq.artemis.core.persistence.QueueBindingInfo; +import org.apache.activemq.artemis.core.persistence.impl.PageCountPending; +import org.apache.activemq.artemis.core.persistence.impl.journal.AddMessageRecord; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.Transaction; public interface JournalLoader { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java index a210be3471..622cdd1d05 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java @@ -14,29 +14,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; /** * A queue that will discard messages if a newer message with the same - * {@link org.apache.activemq.core.message.impl.MessageImpl#HDR_LAST_VALUE_NAME} property value. In other words it only retains the last + * {@link org.apache.activemq.artemis.core.message.impl.MessageImpl#HDR_LAST_VALUE_NAME} property value. In other words it only retains the last * value *

* This is useful for example, for stock prices, where you're only interested in the latest value @@ -279,7 +279,7 @@ public class LastValueQueue extends QueueImpl } /* (non-Javadoc) - * @see org.apache.activemq.core.server.MessageReference#acknowledge(org.apache.activemq.core.server.MessageReference) + * @see org.apache.activemq.artemis.core.server.MessageReference#acknowledge(org.apache.activemq.artemis.core.server.MessageReference) */ @Override public void acknowledge() throws Exception @@ -288,7 +288,7 @@ public class LastValueQueue extends QueueImpl } /* (non-Javadoc) - * @see org.apache.activemq.core.server.MessageReference#getMessageMemoryEstimate() + * @see org.apache.activemq.artemis.core.server.MessageReference#getMessageMemoryEstimate() */ public int getMessageMemoryEstimate() { @@ -296,7 +296,7 @@ public class LastValueQueue extends QueueImpl } /* (non-Javadoc) - * @see org.apache.activemq.core.server.MessageReference#setConsumerId(java.lang.Long) + * @see org.apache.activemq.artemis.core.server.MessageReference#setConsumerId(java.lang.Long) */ @Override public void setConsumerId(Long consumerID) @@ -305,7 +305,7 @@ public class LastValueQueue extends QueueImpl } /* (non-Javadoc) - * @see org.apache.activemq.core.server.MessageReference#getConsumerId() + * @see org.apache.activemq.artemis.core.server.MessageReference#getConsumerId() */ @Override public Long getConsumerId() diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LiveActivation.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveActivation.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LiveActivation.java index c7862302d6..5b20d5d139 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveActivation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LiveActivation.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.impl; +package org.apache.activemq.artemis.core.server.impl; public abstract class LiveActivation extends Activation { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveOnlyActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LiveOnlyActivation.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveOnlyActivation.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LiveOnlyActivation.java index 9540a09a4e..7dc2143cae 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LiveOnlyActivation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LiveOnlyActivation.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.postoffice.DuplicateIDCache; -import org.apache.activemq.core.postoffice.impl.PostOfficeImpl; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.LiveNodeLocator; -import org.apache.activemq.core.server.cluster.ActiveMQServerSideProtocolManagerFactory; -import org.apache.activemq.core.server.cluster.ha.LiveOnlyPolicy; -import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache; +import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.LiveNodeLocator; +import org.apache.activemq.artemis.core.server.cluster.ActiveMQServerSideProtocolManagerFactory; +import org.apache.activemq.artemis.core.server.cluster.ha.LiveOnlyPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.ScaleDownPolicy; import java.util.HashMap; import java.util.List; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java index e0d445aafd..f01f65cfb3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.utils.MemorySize; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.utils.MemorySize; /** * Implementation of a MessageReference diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForReplication.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForReplication.java index d169f97a8a..455b04f1dd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForReplication.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.core.server.LiveNodeLocator; -import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.core.server.LiveNodeLocator; +import org.apache.activemq.artemis.core.server.cluster.qourum.SharedNothingBackupQuorum; /** * NamedLiveNodeLocatorForReplication looks for a live server in the cluster with a specific backupGroupName * - * @see org.apache.activemq.core.server.cluster.ha.HAPolicy#getGroupName() + * @see org.apache.activemq.artemis.core.server.cluster.ha.HAPolicy#getGroupName() */ public class NamedLiveNodeLocatorForReplication extends LiveNodeLocator { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForScaleDown.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForScaleDown.java index 6c3fc0840a..d4b999245c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForScaleDown.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.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.HashMap; import java.util.Iterator; @@ -24,17 +24,17 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.LiveNodeLocator; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.LiveNodeLocator; /** * NamedLiveNodeLocatorForScaleDown looks for a live server in the cluster with a specific scaleDownGroupName * - * @see org.apache.activemq.core.config.Configuration#getScaleDownGroupName() + * @see org.apache.activemq.artemis.core.config.Configuration#getScaleDownGroupName() */ public class NamedLiveNodeLocatorForScaleDown extends LiveNodeLocator { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedNodeIdNodeLocator.java similarity index 82% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedNodeIdNodeLocator.java index fea7165d7f..1aaf3d7544 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedNodeIdNodeLocator.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedNodeIdNodeLocator.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.core.server.LiveNodeLocator; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.core.server.LiveNodeLocator; public class NamedNodeIdNodeLocator extends LiveNodeLocator { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/PostOfficeJournalLoader.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java index 90a035ee7c..88df7a18cb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/PostOfficeJournalLoader.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.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.impl; +package org.apache.activemq.artemis.core.server.impl; import javax.transaction.xa.Xid; import java.util.Collection; @@ -24,41 +24,41 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.filter.impl.FilterImpl; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.paging.cursor.PageSubscriptionCounter; -import org.apache.activemq.core.paging.impl.Page; -import org.apache.activemq.core.persistence.GroupingInfo; -import org.apache.activemq.core.persistence.QueueBindingInfo; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.persistence.impl.PageCountPending; -import org.apache.activemq.core.persistence.impl.journal.AddMessageRecord; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.DuplicateIDCache; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq.core.postoffice.impl.PostOfficeImpl; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.QueueFactory; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.group.GroupingHandler; -import org.apache.activemq.core.server.group.impl.GroupBinding; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.filter.impl.FilterImpl; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq.artemis.core.paging.impl.Page; +import org.apache.activemq.artemis.core.persistence.GroupingInfo; +import org.apache.activemq.artemis.core.persistence.QueueBindingInfo; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.persistence.impl.PageCountPending; +import org.apache.activemq.artemis.core.persistence.impl.journal.AddMessageRecord; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.group.GroupingHandler; +import org.apache.activemq.artemis.core.server.group.impl.GroupBinding; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; public class PostOfficeJournalLoader implements JournalLoader { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java index 996c2b152d..ad8bba2a29 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.QueueFactory; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.utils.ExecutorFactory; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.utils.ExecutorFactory; /** * diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java index c6f94d651d..7c007f8851 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.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.impl; +package org.apache.activemq.artemis.core.server.impl; import java.io.PrintWriter; import java.io.StringWriter; @@ -40,53 +40,53 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.paging.cursor.PagedReference; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.postoffice.DuplicateIDCache; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.impl.PostOfficeImpl; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.Consumer; -import org.apache.activemq.core.server.HandleStatus; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ScheduledDeliveryHandler; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.RemoteQueueBinding; -import org.apache.activemq.core.server.cluster.impl.Redistributor; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.HierarchicalRepositoryChangeListener; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq.core.transaction.impl.BindingsTransactionImpl; -import org.apache.activemq.core.transaction.impl.TransactionImpl; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.FutureLatch; -import org.apache.activemq.utils.LinkedListIterator; -import org.apache.activemq.utils.PriorityLinkedList; -import org.apache.activemq.utils.PriorityLinkedListImpl; -import org.apache.activemq.utils.ReferenceCounter; -import org.apache.activemq.utils.ReusableLatch; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.paging.cursor.PagedReference; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.Bindings; +import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.Consumer; +import org.apache.activemq.artemis.core.server.HandleStatus; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ScheduledDeliveryHandler; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq.artemis.core.server.cluster.impl.Redistributor; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.HierarchicalRepositoryChangeListener; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.artemis.core.transaction.impl.BindingsTransactionImpl; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.FutureLatch; +import org.apache.activemq.artemis.utils.LinkedListIterator; +import org.apache.activemq.artemis.utils.PriorityLinkedList; +import org.apache.activemq.artemis.utils.PriorityLinkedListImpl; +import org.apache.activemq.artemis.utils.ReferenceCounter; +import org.apache.activemq.artemis.utils.ReusableLatch; +import org.apache.activemq.artemis.utils.TypedProperties; /** * Implementation of a Queue diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RefsOperation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/RefsOperation.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java index 8db1144217..bd6d772862 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RefsOperation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RefsOperation.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionOperationAbstract; -import org.apache.activemq.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; import java.util.ArrayList; import java.util.HashMap; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationError.java similarity index 68% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationError.java index 63e71ecb9a..b1b9fd84af 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ReplicationError.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ReplicationError.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQInternalErrorException; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.LiveNodeLocator; -import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.LiveNodeLocator; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; /** * Stops the backup in case of an error at the start of Replication. *

* Using an interceptor for the task to avoid a server reference inside of the 'basic' channel-0 - * handler at {@link org.apache.activemq.core.protocol.core.impl.ActiveMQClientProtocolManager.Channel0Handler}. As {@link org.apache.activemq.core.protocol.core.impl.ActiveMQClientProtocolManager} - * is also shipped in the activemq-core-client JAR (which does not include {@link org.apache.activemq.core.server.ActiveMQServer}). + * handler at {@link org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQClientProtocolManager.Channel0Handler}. As {@link org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQClientProtocolManager} + * is also shipped in the activemq-core-client JAR (which does not include {@link org.apache.activemq.artemis.core.server.ActiveMQServer}). */ final class ReplicationError implements Interceptor { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RoutingContextImpl.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RoutingContextImpl.java index 78c7a1bb9e..cb8bd1e81b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/RoutingContextImpl.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.RouteContextList; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.RouteContextList; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.transaction.Transaction; public final class RoutingContextImpl implements RoutingContext { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScaleDownHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScaleDownHandler.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java index adc2fc5e98..1b228895fb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScaleDownHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.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.impl; +package org.apache.activemq.artemis.core.server.impl; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -28,40 +28,40 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientRequestor; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.api.core.management.ResourceNames; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.paging.cursor.PagedReference; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq.core.postoffice.impl.PostOfficeImpl; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.ClusterControl; -import org.apache.activemq.core.server.cluster.ClusterController; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionOperation; -import org.apache.activemq.core.transaction.impl.TransactionImpl; -import org.apache.activemq.utils.LinkedListIterator; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientRequestor; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.api.core.management.ResourceNames; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.paging.cursor.PagedReference; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.Bindings; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.ClusterControl; +import org.apache.activemq.artemis.core.server.cluster.ClusterController; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionOperation; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.utils.LinkedListIterator; public class ScaleDownHandler { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerImpl.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerImpl.java index 6cf3e87b0b..43ec8f045e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerImpl.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.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.ArrayList; import java.util.Comparator; @@ -28,11 +28,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ScheduledDeliveryHandler; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ScheduledDeliveryHandler; /** * Handles scheduling deliveries to a queue at the correct time. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java index 160c2448ed..6b77c04ba7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.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.impl; +package org.apache.activemq.artemis.core.server.impl; import java.math.BigDecimal; import java.util.Iterator; @@ -27,37 +27,37 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.core.client.impl.ClientConsumerImpl; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.message.BodyEncoder; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.QueueBinding; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.HandleStatus; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerConsumer; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.ServerSession; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.impl.TransactionImpl; -import org.apache.activemq.spi.core.protocol.SessionCallback; -import org.apache.activemq.spi.core.remoting.ReadyListener; -import org.apache.activemq.utils.FutureLatch; -import org.apache.activemq.utils.LinkedListIterator; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.core.client.impl.ClientConsumerImpl; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.message.BodyEncoder; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.QueueBinding; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.HandleStatus; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerConsumer; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.ServerSession; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.spi.core.remoting.ReadyListener; +import org.apache.activemq.artemis.utils.FutureLatch; +import org.apache.activemq.artemis.utils.LinkedListIterator; +import org.apache.activemq.artemis.utils.TypedProperties; /** * Concrete implementation of a ClientConsumer. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerInfo.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerInfo.java index ca101dfd56..033878ac59 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerInfo.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; import java.util.Date; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.utils.SizeFormatterUtil; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.utils.SizeFormatterUtil; public class ServerInfo { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerMessageImpl.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerMessageImpl.java index 8d98985fa0..ff14ecfdfd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerMessageImpl.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; import java.io.InputStream; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.utils.DataConstants; -import org.apache.activemq.utils.MemorySize; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.utils.DataConstants; +import org.apache.activemq.artemis.utils.MemorySize; +import org.apache.activemq.artemis.utils.TypedProperties; public class ServerMessageImpl extends MessageImpl implements ServerMessage { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java index 6b4939ee46..2d07ec87db 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.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.impl; +package org.apache.activemq.artemis.core.server.impl; import javax.transaction.xa.XAException; import javax.transaction.xa.Xid; @@ -30,61 +30,61 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.management.CoreNotificationType; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.api.core.management.ResourceNames; -import org.apache.activemq.core.client.impl.ClientMessageImpl; -import org.apache.activemq.core.exception.ActiveMQXAException; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.filter.impl.FilterImpl; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.message.impl.MessageInternal; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.persistence.OperationContext; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.BindingType; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.QueueBinding; -import org.apache.activemq.core.remoting.CloseListener; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.core.security.CheckType; -import org.apache.activemq.core.security.SecurityStore; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.BindingQueryResult; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.QueueCreator; -import org.apache.activemq.core.server.QueueQueryResult; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerConsumer; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.ServerSession; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.Transaction.State; -import org.apache.activemq.core.transaction.TransactionFactory; -import org.apache.activemq.core.transaction.TransactionOperationAbstract; -import org.apache.activemq.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq.core.transaction.impl.TransactionImpl; -import org.apache.activemq.spi.core.protocol.RemotingConnection; -import org.apache.activemq.spi.core.protocol.SessionCallback; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.UUID; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.management.CoreNotificationType; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.api.core.management.ResourceNames; +import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl; +import org.apache.activemq.artemis.core.exception.ActiveMQXAException; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.filter.impl.FilterImpl; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.message.impl.MessageInternal; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.BindingType; +import org.apache.activemq.artemis.core.postoffice.Bindings; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.QueueBinding; +import org.apache.activemq.artemis.core.remoting.CloseListener; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.core.security.CheckType; +import org.apache.activemq.artemis.core.security.SecurityStore; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.BindingQueryResult; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.QueueCreator; +import org.apache.activemq.artemis.core.server.QueueQueryResult; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerConsumer; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.ServerSession; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.Transaction.State; +import org.apache.activemq.artemis.core.transaction.TransactionFactory; +import org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.artemis.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; +import org.apache.activemq.artemis.spi.core.protocol.SessionCallback; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.UUID; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; /** * Server side Session implementation diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistry.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistry.java index e0bffe476d..dcb1137386 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistry.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.impl; +package org.apache.activemq.artemis.core.server.impl; import java.util.Collection; import java.util.Collections; @@ -23,10 +23,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.config.ConnectorServiceConfiguration; -import org.apache.activemq.core.server.ConnectorServiceFactory; +import org.apache.activemq.artemis.api.core.Interceptor; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration; +import org.apache.activemq.artemis.core.server.ConnectorServiceFactory; public class ServiceRegistry { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java index a8e9aef78a..7d081fa653 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingBackupActivation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java @@ -14,42 +14,42 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQInternalErrorException; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.apache.activemq.core.replication.ReplicationEndpoint; -import org.apache.activemq.core.server.ActivationParams; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.LiveNodeLocator; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.QueueFactory; -import org.apache.activemq.core.server.cluster.ClusterControl; -import org.apache.activemq.core.server.cluster.ClusterController; -import org.apache.activemq.core.server.cluster.ha.ReplicaPolicy; -import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy; -import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum; -import org.apache.activemq.core.server.group.GroupingHandler; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.utils.ReusableLatch; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq.artemis.core.replication.ReplicationEndpoint; +import org.apache.activemq.artemis.core.server.ActivationParams; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.LiveNodeLocator; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.core.server.cluster.ClusterControl; +import org.apache.activemq.artemis.core.server.cluster.ClusterController; +import org.apache.activemq.artemis.core.server.cluster.ha.ReplicaPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq.artemis.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq.artemis.core.server.group.GroupingHandler; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.utils.ReusableLatch; import java.util.Map; import java.util.concurrent.TimeUnit; -import static org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAILURE_REPLICATING; -import static org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAIL_OVER; -import static org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.STOP; +import static org.apache.activemq.artemis.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAILURE_REPLICATING; +import static org.apache.activemq.artemis.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.FAIL_OVER; +import static org.apache.activemq.artemis.core.server.cluster.qourum.SharedNothingBackupQuorum.BACKUP_ACTIVATION.STOP; public final class SharedNothingBackupActivation extends Activation { @@ -431,7 +431,7 @@ public final class SharedNothingBackupActivation extends Activation } /** - * @throws org.apache.activemq.api.core.ActiveMQException + * @throws ActiveMQException */ public void remoteFailOver(ReplicationLiveIsStoppingMessage.LiveStopping finalMessage) throws ActiveMQException { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java index abfffd6b2e..038c77efc7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedNothingLiveActivation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java @@ -14,40 +14,40 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.ActiveMQAlreadyReplicatingException; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQIllegalStateException; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClusterTopologyListener; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.TopologyMember; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.client.impl.ServerLocatorInternal; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.ConfigurationUtils; -import org.apache.activemq.core.protocol.core.Channel; -import org.apache.activemq.core.protocol.core.ChannelHandler; -import org.apache.activemq.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq.core.protocol.core.Packet; -import org.apache.activemq.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupRegistrationMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.apache.activemq.core.remoting.CloseListener; -import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.replication.ReplicationManager; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.server.cluster.ha.ReplicatedPolicy; -import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.api.core.ActiveMQAlreadyReplicatingException; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.TopologyMember; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.ConfigurationUtils; +import org.apache.activemq.artemis.core.protocol.core.Channel; +import org.apache.activemq.artemis.core.protocol.core.ChannelHandler; +import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.artemis.core.protocol.core.Packet; +import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupRegistrationMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq.artemis.core.remoting.CloseListener; +import org.apache.activemq.artemis.core.remoting.FailureListener; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.replication.ReplicationManager; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; import java.lang.reflect.Array; import java.util.List; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java index 459e725801..90b2f81054 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreBackupActivation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.QueueFactory; -import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy; -import org.apache.activemq.core.server.cluster.ha.SharedStoreSlavePolicy; -import org.apache.activemq.core.server.group.GroupingHandler; -import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq.artemis.core.server.group.GroupingHandler; +import org.apache.activemq.artemis.core.server.management.ManagementService; import java.nio.channels.ClosedChannelException; import java.util.concurrent.TimeUnit; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreLiveActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreLiveActivation.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java index f1ffc7e2b1..a693a237ed 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/SharedStoreLiveActivation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.cluster.ha.SharedStoreMasterPolicy; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreMasterPolicy; /** * Created by andy on 04/09/14. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/TransientQueueManagerImpl.java similarity index 83% rename from activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/TransientQueueManagerImpl.java index 81d47a5707..c02eb6ac52 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/TransientQueueManagerImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.TransientQueueManager; -import org.apache.activemq.utils.ReferenceCounterUtil; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.TransientQueueManager; +import org.apache.activemq.artemis.utils.ReferenceCounterUtil; public class TransientQueueManagerImpl implements TransientQueueManager { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ManagementService.java similarity index 68% rename from activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ManagementService.java index 96929e7533..c36c097f85 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ManagementService.java @@ -14,41 +14,41 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.management; +package org.apache.activemq.artemis.core.server.management; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import javax.management.ObjectName; -import org.apache.activemq.api.core.BroadcastGroupConfiguration; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.management.ObjectNameBuilder; -import org.apache.activemq.core.config.BridgeConfiguration; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.DivertConfiguration; -import org.apache.activemq.core.management.impl.ActiveMQServerControlImpl; -import org.apache.activemq.core.messagecounter.MessageCounterManager; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.Divert; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.QueueFactory; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.Bridge; -import org.apache.activemq.core.server.cluster.BroadcastGroup; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; +import org.apache.activemq.artemis.core.config.BridgeConfiguration; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.DivertConfiguration; +import org.apache.activemq.artemis.core.management.impl.ActiveMQServerControlImpl; +import org.apache.activemq.artemis.core.messagecounter.MessageCounterManager; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.Divert; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.Bridge; +import org.apache.activemq.artemis.core.server.cluster.BroadcastGroup; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; public interface ManagementService extends NotificationService, ActiveMQComponent { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java index 6a5443881f..dc502c6715 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.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.management.impl; +package org.apache.activemq.artemis.core.server.management.impl; import javax.management.InstanceNotFoundException; import javax.management.MBeanRegistrationException; @@ -33,56 +33,57 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.BroadcastGroupConfiguration; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.management.AcceptorControl; -import org.apache.activemq.api.core.management.BridgeControl; -import org.apache.activemq.api.core.management.BroadcastGroupControl; -import org.apache.activemq.api.core.management.ClusterConnectionControl; -import org.apache.activemq.api.core.management.DivertControl; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.api.core.management.ObjectNameBuilder; -import org.apache.activemq.api.core.management.ResourceNames; -import org.apache.activemq.core.config.BridgeConfiguration; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.DivertConfiguration; -import org.apache.activemq.core.management.impl.AcceptorControlImpl; -import org.apache.activemq.core.management.impl.AddressControlImpl; -import org.apache.activemq.core.management.impl.BridgeControlImpl; -import org.apache.activemq.core.management.impl.BroadcastGroupControlImpl; -import org.apache.activemq.core.management.impl.ClusterConnectionControlImpl; -import org.apache.activemq.core.management.impl.DivertControlImpl; -import org.apache.activemq.core.management.impl.ActiveMQServerControlImpl; -import org.apache.activemq.core.management.impl.QueueControlImpl; -import org.apache.activemq.core.messagecounter.MessageCounter; -import org.apache.activemq.core.messagecounter.MessageCounterManager; -import org.apache.activemq.core.messagecounter.impl.MessageCounterManagerImpl; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.Divert; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.QueueFactory; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.Bridge; -import org.apache.activemq.core.server.cluster.BroadcastGroup; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.server.management.NotificationListener; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.management.AcceptorControl; +import org.apache.activemq.artemis.api.core.management.BridgeControl; +import org.apache.activemq.artemis.api.core.management.BroadcastGroupControl; +import org.apache.activemq.artemis.api.core.management.ClusterConnectionControl; +import org.apache.activemq.artemis.api.core.management.DivertControl; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; +import org.apache.activemq.artemis.api.core.management.ResourceNames; +import org.apache.activemq.artemis.core.config.BridgeConfiguration; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.DivertConfiguration; +import org.apache.activemq.artemis.core.management.impl.AcceptorControlImpl; +import org.apache.activemq.artemis.core.management.impl.AddressControlImpl; +import org.apache.activemq.artemis.core.management.impl.BridgeControlImpl; +import org.apache.activemq.artemis.core.management.impl.BroadcastGroupControlImpl; +import org.apache.activemq.artemis.core.management.impl.ClusterConnectionControlImpl; +import org.apache.activemq.artemis.core.management.impl.DivertControlImpl; +import org.apache.activemq.artemis.core.management.impl.ActiveMQServerControlImpl; +import org.apache.activemq.artemis.core.management.impl.QueueControlImpl; +import org.apache.activemq.artemis.core.messagecounter.MessageCounter; +import org.apache.activemq.artemis.core.messagecounter.MessageCounterManager; +import org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterManagerImpl; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.Divert; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.Bridge; +import org.apache.activemq.artemis.core.server.cluster.BroadcastGroup; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.server.management.NotificationListener; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.TypedProperties; public class ManagementServiceImpl implements ManagementService { @@ -124,7 +125,7 @@ public class ManagementServiceImpl implements ManagementService private boolean notificationsEnabled; - private final Set listeners = new org.apache.activemq.utils.ConcurrentHashSet(); + private final Set listeners = new ConcurrentHashSet(); private final ObjectNameBuilder objectNameBuilder; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/HierarchicalRepository.java similarity index 97% rename from activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/HierarchicalRepository.java index 57805c0272..ae440adc83 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/HierarchicalRepository.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.settings; +package org.apache.activemq.artemis.core.settings; import java.util.List; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/HierarchicalRepositoryChangeListener.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/HierarchicalRepositoryChangeListener.java index 0d9cad91e0..929b598bc0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/HierarchicalRepositoryChangeListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.settings; +package org.apache.activemq.artemis.core.settings; public interface HierarchicalRepositoryChangeListener { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/Mergeable.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/Mergeable.java index a73b3785e1..4bfee115dd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/Mergeable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.settings; +package org.apache.activemq.artemis.core.settings; /** * Used when merging objects together. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java similarity index 98% rename from activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java index 8bbcbd7026..84efb653da 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.settings.impl; +package org.apache.activemq.artemis.core.settings.impl; import java.io.Serializable; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.journal.EncodingSupport; -import org.apache.activemq.core.settings.Mergeable; -import org.apache.activemq.utils.BufferHelper; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.settings.Mergeable; +import org.apache.activemq.artemis.utils.BufferHelper; /** * Configuration settings that are applied on the address level diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/HierarchicalObjectRepository.java similarity index 97% rename from activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/HierarchicalObjectRepository.java index ee7f8be9d5..6b018c5c24 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/HierarchicalObjectRepository.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.settings.impl; +package org.apache.activemq.artemis.core.settings.impl; import java.io.Serializable; import java.util.ArrayList; @@ -30,10 +30,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.HierarchicalRepositoryChangeListener; -import org.apache.activemq.core.settings.Mergeable; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.HierarchicalRepositoryChangeListener; +import org.apache.activemq.artemis.core.settings.Mergeable; /** * allows objects to be mapped against a regex pattern and held in order in a list diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/Match.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/Match.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/settings/impl/Match.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/Match.java index 4d6a9a63e0..103700fd74 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/Match.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/Match.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.settings.impl; +package org.apache.activemq.artemis.core.settings.impl; import java.util.regex.Pattern; -import org.apache.activemq.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; /** a Match is the holder for the match string and the object to hold against it. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/SlowConsumerPolicy.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/SlowConsumerPolicy.java index e0c8a7828f..3e51c4303e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/SlowConsumerPolicy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.settings.impl; +package org.apache.activemq.artemis.core.settings.impl; public enum SlowConsumerPolicy { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/ResourceManager.java similarity index 92% rename from activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/ResourceManager.java index 9ce57d28a7..fd844cc178 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/ResourceManager.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction; +package org.apache.activemq.artemis.core.transaction; import java.util.List; import java.util.Map; import javax.transaction.xa.Xid; -import org.apache.activemq.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; public interface ResourceManager extends ActiveMQComponent { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java similarity index 88% rename from activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java index ee3a084fe2..38c43bf7c7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction; +package org.apache.activemq.artemis.core.transaction; import java.util.List; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.impl.RefsOperation; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.impl.RefsOperation; /** * A ActiveMQ internal transaction diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionDetail.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionDetail.java index 41d37cb560..c8f4c5f63c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionDetail.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction; +package org.apache.activemq.artemis.core.transaction; import java.text.DateFormat; import java.util.Date; @@ -23,11 +23,11 @@ import java.util.Map; import javax.transaction.xa.Xid; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.transaction.impl.XidImpl; -import org.apache.activemq.utils.json.JSONArray; -import org.apache.activemq.utils.json.JSONObject; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.transaction.impl.XidImpl; +import org.apache.activemq.artemis.utils.json.JSONArray; +import org.apache.activemq.artemis.utils.json.JSONObject; public abstract class TransactionDetail { @@ -85,11 +85,11 @@ public abstract class TransactionDetail { String opClassName = op.getClass().getName(); String opType = null; - if (opClassName.equals("org.apache.activemq.core.postoffice.impl.PostOfficeImpl$AddOperation")) + if (opClassName.equals("org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl$AddOperation")) { opType = "(+) send"; } - else if (opClassName.equals("org.apache.activemq.core.server.impl.QueueImpl$RefsOperation")) + else if (opClassName.equals("org.apache.activemq.artemis.core.server.impl.QueueImpl$RefsOperation")) { opType = "(-) receive"; } diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionFactory.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionFactory.java index f9d0475a82..7d20b535dc 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionFactory.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction; +package org.apache.activemq.artemis.core.transaction; -import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.persistence.StorageManager; import javax.transaction.xa.Xid; diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionOperation.java similarity index 93% rename from activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionOperation.java index b9e1b90141..9b36de8ce7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionOperation.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction; +package org.apache.activemq.artemis.core.transaction; import java.util.List; -import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.MessageReference; /** * diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionOperationAbstract.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionOperationAbstract.java index 3ab77e7979..4f79085d4a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionOperationAbstract.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction; +package org.apache.activemq.artemis.core.transaction; import java.util.Collections; import java.util.List; -import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.MessageReference; /** * Just a helper, when you don't want to implement all the methods on a transaction operation. @@ -74,7 +74,7 @@ public abstract class TransactionOperationAbstract implements TransactionOperati } /* (non-Javadoc) - * @see org.apache.activemq.core.transaction.TransactionOperation#getListOnConsumer(long) + * @see org.apache.activemq.artemis.core.transaction.TransactionOperation#getListOnConsumer(long) */ @Override public List getListOnConsumer(long consumerID) diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionPropertyIndexes.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionPropertyIndexes.java index 1dd2368818..746dedb2e5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionPropertyIndexes.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction; +package org.apache.activemq.artemis.core.transaction; public class TransactionPropertyIndexes { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/BindingsTransactionImpl.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/BindingsTransactionImpl.java index 5aab7ee280..4e20c9263e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/BindingsTransactionImpl.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction.impl; +package org.apache.activemq.artemis.core.transaction.impl; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.impl.RefsOperation; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.impl.RefsOperation; public class BindingsTransactionImpl extends TransactionImpl { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/CoreTransactionDetail.java similarity index 85% rename from activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/CoreTransactionDetail.java index 507fbfcf12..e6dc9c6b02 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/CoreTransactionDetail.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction.impl; +package org.apache.activemq.artemis.core.transaction.impl; import java.util.Map; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionDetail; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionDetail; public class CoreTransactionDetail extends TransactionDetail { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/ResourceManagerImpl.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/ResourceManagerImpl.java index b29074738b..3d81c129d0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/ResourceManagerImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction.impl; +package org.apache.activemq.artemis.core.transaction.impl; import java.util.ArrayList; import java.util.HashMap; @@ -31,9 +31,9 @@ import java.util.concurrent.TimeUnit; import javax.transaction.xa.Xid; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.core.transaction.Transaction; public class ResourceManagerImpl implements ResourceManager { diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImpl.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImpl.java index 4697fbac71..7af027cfe0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.transaction.impl; +package org.apache.activemq.artemis.core.transaction.impl; import javax.transaction.xa.Xid; @@ -22,14 +22,14 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.journal.IOAsyncTask; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.impl.RefsOperation; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.core.transaction.TransactionOperation; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.core.journal.IOAsyncTask; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.impl.RefsOperation; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.core.transaction.TransactionOperation; public class TransactionImpl implements Transaction { diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/naming/BindingRegistry.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/naming/BindingRegistry.java index 93a54adaec..1b8e227f62 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/naming/BindingRegistry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.naming; +package org.apache.activemq.artemis.spi.core.naming; /** * Abstract interface for a registry to store endpoints like connection factories into. diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/AbstractProtocolManagerFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractProtocolManagerFactory.java similarity index 94% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/AbstractProtocolManagerFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractProtocolManagerFactory.java index df2d555ee9..c9043887f4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/AbstractProtocolManagerFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractProtocolManagerFactory.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.activemq.spi.core.protocol; +package org.apache.activemq.artemis.spi.core.protocol; import java.util.Collections; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.apache.activemq.api.core.BaseInterceptor; +import org.apache.activemq.artemis.api.core.BaseInterceptor; public abstract class AbstractProtocolManagerFactory

implements ProtocolManagerFactory

{ diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessageConverter.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessageConverter.java index 2fa478cafb..c57c7b214b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessageConverter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.protocol; +package org.apache.activemq.artemis.spi.core.protocol; -import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; // TODO: use this interface properly on OpenWire public interface MessageConverter diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java similarity index 82% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java index c07d1b751b..989fb16acb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManager.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.protocol; +package org.apache.activemq.artemis.spi.core.protocol; import java.util.List; import io.netty.channel.ChannelPipeline; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.BaseInterceptor; -import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.BaseInterceptor; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.spi.core.remoting.Connection; public interface ProtocolManager

{ diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManagerFactory.java similarity index 86% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManagerFactory.java index 69f2426f4e..a319452838 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/ProtocolManagerFactory.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.protocol; +package org.apache.activemq.artemis.spi.core.protocol; import java.util.List; -import org.apache.activemq.api.core.BaseInterceptor; -import org.apache.activemq.core.server.ActiveMQServer; +import org.apache.activemq.artemis.api.core.BaseInterceptor; +import org.apache.activemq.artemis.core.server.ActiveMQServer; public interface ProtocolManagerFactory

{ /** * When you create the ProtocolManager, you should filter out any interceptors that won't belong * to this Protocol. - * For example don't send any core Interceptors {@link org.apache.activemq.api.core.Interceptor} to Stomp * * * + * For example don't send any core Interceptors {@link org.apache.activemq.artemis.api.core.Interceptor} to Stomp * * * * @param server * @param incomingInterceptors * @param outgoingInterceptors diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/SessionCallback.java similarity index 84% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/SessionCallback.java index cde905b3f7..3e0c55e7d8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/SessionCallback.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.protocol; +package org.apache.activemq.artemis.spi.core.protocol; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.server.ServerConsumer; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.spi.core.remoting.ReadyListener; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.server.ServerConsumer; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.spi.core.remoting.ReadyListener; public interface SessionCallback { diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Acceptor.java similarity index 84% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Acceptor.java index 94bbdab9b8..1fdb6ce435 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/remoting/Acceptor.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; import java.util.Map; -import org.apache.activemq.core.security.ActiveMQPrincipal; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.server.management.NotificationService; +import org.apache.activemq.artemis.core.security.ActiveMQPrincipal; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.server.management.NotificationService; /** * An Acceptor is used by the RemotingService to allow clients to connect. It should take care of diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/remoting/AcceptorFactory.java similarity index 87% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/remoting/AcceptorFactory.java index 51b1c859f1..d22f60cbba 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/remoting/AcceptorFactory.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager; /** * A factory for creating acceptors. *

- * An Acceptor is an endpoint that a {@link org.apache.activemq.spi.core.remoting.Connector} will connect to and is used by the remoting service. + * An Acceptor is an endpoint that a {@link org.apache.activemq.artemis.spi.core.remoting.Connector} will connect to and is used by the remoting service. */ public interface AcceptorFactory { diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ServerConnectionLifeCycleListener.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ServerConnectionLifeCycleListener.java index 72ba062eba..85c7fcc2ff 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ServerConnectionLifeCycleListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.remoting; +package org.apache.activemq.artemis.spi.core.remoting; public interface ServerConnectionLifeCycleListener extends ConnectionLifeCycleListener { diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManager.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManager.java index 1d37c1b1a0..08bbda74cb 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManager.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.security; +package org.apache.activemq.artemis.spi.core.security; import java.util.Set; -import org.apache.activemq.core.security.CheckType; -import org.apache.activemq.core.security.Role; +import org.apache.activemq.artemis.core.security.CheckType; +import org.apache.activemq.artemis.core.security.Role; /** * Use to validate whether a user has is valid to connect to the server and perform certain diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java similarity index 91% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java index 2bc34f796a..1adf4631a3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.security; +package org.apache.activemq.artemis.spi.core.security; import java.util.List; import java.util.Set; -import org.apache.activemq.core.config.impl.SecurityConfiguration; -import org.apache.activemq.core.security.CheckType; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.security.User; +import org.apache.activemq.artemis.core.config.impl.SecurityConfiguration; +import org.apache.activemq.artemis.core.security.CheckType; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.security.User; /** * A basic implementation of the ActiveMQSecurityManager. This can be used within an appserver and be deployed by diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/JAASSecurityManager.java similarity index 96% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/JAASSecurityManager.java index 99cc3298ec..0193672e61 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/JAASSecurityManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.spi.core.security; +package org.apache.activemq.artemis.spi.core.security; import java.security.Principal; import java.security.acl.Group; @@ -28,9 +28,9 @@ import javax.security.auth.login.Configuration; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.apache.activemq.core.security.CheckType; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.security.CheckType; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; /** * This implementation delegates to the JAAS security interfaces. diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/package-info.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/package-info.java new file mode 100644 index 0000000000..128c97ca77 --- /dev/null +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/package-info.java @@ -0,0 +1,18 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.artemis.spi.core.security; + diff --git a/activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/uri/AcceptorTransportConfigurationParser.java similarity index 82% rename from activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/uri/AcceptorTransportConfigurationParser.java index 47ef366738..edc7e1a5d0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/uri/AcceptorTransportConfigurationParser.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.utils.uri.URIFactory; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.utils.uri.URIFactory; import java.util.List; diff --git a/activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java b/artemis-server/src/main/java/org/apache/activemq/artemis/uri/InVMAcceptorTransportConfigurationSchema.java similarity index 89% rename from activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/uri/InVMAcceptorTransportConfigurationSchema.java index a1bc3d6e09..87f4286022 100644 --- a/activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/uri/InVMAcceptorTransportConfigurationSchema.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; public class InVMAcceptorTransportConfigurationSchema extends InVMTransportConfigurationSchema { diff --git a/activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java b/artemis-server/src/main/java/org/apache/activemq/artemis/uri/TCPAcceptorTransportConfigurationSchema.java similarity index 90% rename from activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/uri/TCPAcceptorTransportConfigurationSchema.java index d48f33b771..9c45a2dac6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/uri/TCPAcceptorTransportConfigurationSchema.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.uri; +package org.apache.activemq.artemis.uri; -import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory; import java.net.URI; import java.util.Set; diff --git a/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java b/artemis-server/src/main/java/org/apache/activemq/artemis/utils/XMLConfigurationUtil.java similarity index 95% rename from activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/utils/XMLConfigurationUtil.java index ea1d799581..8f124eb64e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/utils/XMLConfigurationUtil.java @@ -14,9 +14,9 @@ * 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.apache.activemq.core.config.impl.Validators; +import org.apache.activemq.artemis.core.config.impl.Validators; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -116,7 +116,7 @@ public class XMLConfigurationUtil NodeList nl = e.getElementsByTagName(name); if (nl.getLength() > 0) { - return org.apache.activemq.utils.XMLUtil.parseBoolean(nl.item(0)); + return XMLUtil.parseBoolean(nl.item(0)); } else { diff --git a/activemq-server/src/main/resources/schema/activemq-configuration.xsd b/artemis-server/src/main/resources/schema/activemq-configuration.xsd similarity index 99% rename from activemq-server/src/main/resources/schema/activemq-configuration.xsd rename to artemis-server/src/main/resources/schema/activemq-configuration.xsd index 31b840cb60..e9b4c130d3 100644 --- a/activemq-server/src/main/resources/schema/activemq-configuration.xsd +++ b/artemis-server/src/main/resources/schema/activemq-configuration.xsd @@ -154,7 +154,7 @@ + default="org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec" maxOccurs="1" minOccurs="0"> Class name and its parameters for the Decoder used to decode the masked password. Ignored if @@ -1049,14 +1049,6 @@ - - - - Producer flow control on the bridge (default disabled = -1) - - - - @@ -1239,14 +1231,6 @@ - - - - Producer flow control on the bridge (default disabled = -1) - - - - diff --git a/activemq-server/src/main/resources/schema/activemq-server.xsd b/artemis-server/src/main/resources/schema/activemq-server.xsd similarity index 100% rename from activemq-server/src/main/resources/schema/activemq-server.xsd rename to artemis-server/src/main/resources/schema/activemq-server.xsd diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java similarity index 97% rename from activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java index 9ddef638ff..de509150bb 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; +package org.apache.activemq.artemis.core.config.impl; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration; import org.junit.Before; import org.junit.Test; @@ -28,12 +28,12 @@ import java.io.ObjectOutputStream; import org.junit.Assert; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.journal.impl.JournalConstants; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.tests.util.RandomUtil; -import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.journal.impl.JournalConstants; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.apache.activemq.artemis.tests.util.UnitTestCase; public class ConfigurationImplTest extends UnitTestCase { diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java similarity index 94% rename from activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java index 30fb0d5706..e0d64511af 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; +package org.apache.activemq.artemis.core.config.impl; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.config.FileDeploymentManager; -import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.config.FileDeploymentManager; +import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration; import org.junit.Test; import java.util.Collections; import org.junit.Assert; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.journal.impl.JournalConstants; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.journal.impl.JournalConstants; public class DefaultsFileConfigurationTest extends ConfigurationImplTest { diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java similarity index 91% rename from activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java index aac18260ab..1c94a45468 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; +package org.apache.activemq.artemis.core.config.impl; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.FileDeploymentManager; -import org.apache.activemq.core.deployers.impl.FileConfigurationParser; -import org.apache.activemq.tests.util.UnitTestCase; -import org.apache.activemq.utils.DefaultSensitiveStringCodec; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.FileDeploymentManager; +import org.apache.activemq.artemis.core.deployers.impl.FileConfigurationParser; +import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec; import org.junit.Test; public class FileConfigurationParserTest extends UnitTestCase @@ -120,7 +120,7 @@ public class FileConfigurationParserTest extends UnitTestCase clusterPasswordPart = "" + mask + ""; - String codecPart = "" + "org.apache.activemq.utils.DefaultSensitiveStringCodec" + + String codecPart = "" + "org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec" + ";key=newkey"; configStr = firstPart + clusterPasswordPart + maskPasswordPart + codecPart + lastPart; @@ -133,7 +133,7 @@ public class FileConfigurationParserTest extends UnitTestCase private static String firstPart = "" + "\n" + "ActiveMQ.main.config" + "\n" + - "org.apache.activemq.integration.logging.Log4jLogDelegateFactory" + "\n" + + "org.apache.activemq.artemis.integration.logging.Log4jLogDelegateFactory" + "\n" + "${jboss.server.data.dir}/activemq/bindings" + "\n" + "${jboss.server.data.dir}/activemq/journal" + "\n" + "10" + "\n" + diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java similarity index 91% rename from activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java index eb2731e30f..b859617ff3 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; +package org.apache.activemq.artemis.core.config.impl; import java.io.File; import java.net.URL; @@ -24,21 +24,21 @@ import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.util.Collections; -import org.apache.activemq.api.core.BroadcastGroupConfiguration; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.UDPBroadcastEndpointFactory; -import org.apache.activemq.core.config.BridgeConfiguration; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.DivertConfiguration; -import org.apache.activemq.core.config.FileDeploymentManager; -import org.apache.activemq.core.config.HAPolicyConfiguration; -import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; +import org.apache.activemq.artemis.core.config.BridgeConfiguration; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.DivertConfiguration; +import org.apache.activemq.artemis.core.config.FileDeploymentManager; +import org.apache.activemq.artemis.core.config.HAPolicyConfiguration; +import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy; import org.junit.Assert; import org.junit.Test; @@ -103,16 +103,16 @@ public class FileConfigurationTest extends ConfigurationImplTest Assert.assertEquals(2, conf.getIncomingInterceptorClassNames().size()); Assert.assertTrue(conf.getIncomingInterceptorClassNames() - .contains("org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1")); + .contains("org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor1")); Assert.assertTrue(conf.getIncomingInterceptorClassNames() - .contains("org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2")); + .contains("org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor2")); Assert.assertEquals(2, conf.getConnectorConfigurations().size()); TransportConfiguration tc = conf.getConnectorConfigurations().get("connector1"); Assert.assertNotNull(tc); - Assert.assertEquals("org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory", tc.getFactoryClassName()); + Assert.assertEquals("org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory", tc.getFactoryClassName()); Assert.assertEquals("mylocal", tc.getParams().get("localAddress")); Assert.assertEquals("99", tc.getParams().get("localPort")); Assert.assertEquals("localhost1", tc.getParams().get("host")); @@ -120,20 +120,20 @@ public class FileConfigurationTest extends ConfigurationImplTest tc = conf.getConnectorConfigurations().get("connector2"); Assert.assertNotNull(tc); - Assert.assertEquals("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory", tc.getFactoryClassName()); + Assert.assertEquals("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory", tc.getFactoryClassName()); Assert.assertEquals("5", tc.getParams().get("serverId")); Assert.assertEquals(2, conf.getAcceptorConfigurations().size()); for (TransportConfiguration ac : conf.getAcceptorConfigurations()) { - if (ac.getFactoryClassName().equals("org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory")) + if (ac.getFactoryClassName().equals("org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory")) { Assert.assertEquals("456", ac.getParams().get("tcpNoDelay")); Assert.assertEquals("44", ac.getParams().get("connectionTtl")); } else { - Assert.assertEquals("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory", + Assert.assertEquals("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory", ac.getFactoryClassName()); Assert.assertEquals("0", ac.getParams().get("serverId")); } @@ -223,7 +223,6 @@ public class FileConfigurationTest extends ConfigurationImplTest Assert.assertEquals(true, bc.isUseDuplicateDetection()); Assert.assertEquals("connector1", bc.getStaticConnectors().get(0)); Assert.assertEquals(null, bc.getDiscoveryGroupName()); - Assert.assertEquals(444, bc.getProducerWindowSize()); } else { @@ -234,7 +233,6 @@ public class FileConfigurationTest extends ConfigurationImplTest Assert.assertEquals(null, bc.getTransformerClassName()); Assert.assertEquals(null, bc.getStaticConnectors()); Assert.assertEquals("dg1", bc.getDiscoveryGroupName()); - Assert.assertEquals(555, bc.getProducerWindowSize()); } } @@ -269,7 +267,6 @@ public class FileConfigurationTest extends ConfigurationImplTest Assert.assertEquals("connector1", ccc.getStaticConnectors().get(0)); Assert.assertEquals("connector2", ccc.getStaticConnectors().get(1)); Assert.assertEquals(null, ccc.getDiscoveryGroupName()); - Assert.assertEquals(222, ccc.getProducerWindowSize()); } else { @@ -283,7 +280,6 @@ public class FileConfigurationTest extends ConfigurationImplTest Assert.assertEquals(2, ccc.getMaxHops()); Assert.assertEquals(Collections.emptyList(), ccc.getStaticConnectors()); Assert.assertEquals("dg1", ccc.getDiscoveryGroupName()); - Assert.assertEquals(333, ccc.getProducerWindowSize()); } } diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java similarity index 91% rename from activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java index cc2cedf95c..57a7b286e8 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java @@ -14,27 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; +package org.apache.activemq.artemis.core.config.impl; -import org.apache.activemq.core.config.FileDeploymentManager; -import org.apache.activemq.core.server.cluster.ha.ColocatedPolicy; -import org.apache.activemq.core.server.cluster.ha.HAPolicy; -import org.apache.activemq.core.server.cluster.ha.LiveOnlyPolicy; -import org.apache.activemq.core.server.cluster.ha.ReplicaPolicy; -import org.apache.activemq.core.server.cluster.ha.ReplicatedPolicy; -import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy; -import org.apache.activemq.core.server.cluster.ha.SharedStoreMasterPolicy; -import org.apache.activemq.core.server.cluster.ha.SharedStoreSlavePolicy; -import org.apache.activemq.core.server.impl.ColocatedActivation; -import org.apache.activemq.core.server.impl.LiveOnlyActivation; -import org.apache.activemq.core.server.impl.SharedNothingBackupActivation; -import org.apache.activemq.core.server.impl.SharedNothingLiveActivation; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.server.impl.Activation; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.SharedStoreBackupActivation; -import org.apache.activemq.core.server.impl.SharedStoreLiveActivation; -import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.artemis.core.config.FileDeploymentManager; +import org.apache.activemq.artemis.core.server.cluster.ha.ColocatedPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.HAPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.LiveOnlyPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.ReplicaPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreMasterPolicy; +import org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq.artemis.core.server.impl.ColocatedActivation; +import org.apache.activemq.artemis.core.server.impl.LiveOnlyActivation; +import org.apache.activemq.artemis.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq.artemis.core.server.impl.SharedNothingLiveActivation; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.server.impl.Activation; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.SharedStoreBackupActivation; +import org.apache.activemq.artemis.core.server.impl.SharedStoreLiveActivation; +import org.apache.activemq.artemis.tests.util.UnitTestCase; import org.junit.Test; import java.util.List; diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ValidatorsTest.java similarity index 96% rename from activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ValidatorsTest.java index 0e98993a3e..98a77f626f 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ValidatorsTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; +package org.apache.activemq.artemis.core.config.impl; import org.junit.Test; import org.junit.Assert; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.tests.util.RandomUtil; public class ValidatorsTest extends Assert { diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java similarity index 91% rename from activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java index b3d21074e8..065e17a1ed 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.config.impl; +package org.apache.activemq.artemis.core.config.impl; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; -import org.apache.activemq.core.deployers.impl.FileConfigurationParser; -import org.apache.activemq.logs.AssertionLoggerHandler; -import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.artemis.core.deployers.impl.FileConfigurationParser; +import org.apache.activemq.artemis.logs.AssertionLoggerHandler; +import org.apache.activemq.artemis.tests.util.UnitTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -66,7 +66,7 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" + "xsi:schemaLocation=\"urn:activemq /schema/activemq-configuration.xsd\">\n" + "ActiveMQ.main.config" + "\n" + - "org.apache.activemq.integration.logging.Log4jLogDelegateFactory" + "\n" + + "org.apache.activemq.artemis.integration.logging.Log4jLogDelegateFactory" + "\n" + "${jboss.server.data.dir}/activemq/bindings" + "\n" + "${jboss.server.data.dir}/activemq/journal" + "\n" + "10" + "\n" + diff --git a/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java similarity index 97% rename from activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java index dcbfd671f3..d94beeea5b 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.filter.impl; +package org.apache.activemq.artemis.core.filter.impl; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQInvalidFilterExpressionException; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.tests.util.RandomUtil; -import org.apache.activemq.tests.util.SilentTestCase; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQInvalidFilterExpressionException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.apache.activemq.artemis.tests.util.SilentTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/list/PriorityLinkedListTest.java similarity index 99% rename from activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/list/PriorityLinkedListTest.java index 2c329cc687..2f1fd0330f 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/list/PriorityLinkedListTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.list; +package org.apache.activemq.artemis.core.list; import org.junit.Before; import org.junit.After; @@ -23,8 +23,8 @@ import org.junit.Test; import org.junit.Assert; -import org.apache.activemq.utils.LinkedListIterator; -import org.apache.activemq.utils.PriorityLinkedListImpl; +import org.apache.activemq.artemis.utils.LinkedListIterator; +import org.apache.activemq.artemis.utils.PriorityLinkedListImpl; public final class PriorityLinkedListTest extends Assert { diff --git a/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/message/impl/MessagePropertyTest.java similarity index 85% rename from activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/message/impl/MessagePropertyTest.java index 1ecb5c99f8..881b212d58 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/message/impl/MessagePropertyTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.message.impl; +package org.apache.activemq.artemis.core.message.impl; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; diff --git a/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java similarity index 89% rename from activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java index 0eaf5ae367..7512f7348f 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.security; +package org.apache.activemq.artemis.core.security; import org.junit.Assert; import org.junit.Test; -import static org.apache.activemq.core.security.CheckType.CONSUME; -import static org.apache.activemq.core.security.CheckType.CREATE_DURABLE_QUEUE; -import static org.apache.activemq.core.security.CheckType.CREATE_NON_DURABLE_QUEUE; -import static org.apache.activemq.core.security.CheckType.DELETE_DURABLE_QUEUE; -import static org.apache.activemq.core.security.CheckType.DELETE_NON_DURABLE_QUEUE; -import static org.apache.activemq.core.security.CheckType.SEND; +import static org.apache.activemq.artemis.core.security.CheckType.CONSUME; +import static org.apache.activemq.artemis.core.security.CheckType.CREATE_DURABLE_QUEUE; +import static org.apache.activemq.artemis.core.security.CheckType.CREATE_NON_DURABLE_QUEUE; +import static org.apache.activemq.artemis.core.security.CheckType.DELETE_DURABLE_QUEUE; +import static org.apache.activemq.artemis.core.security.CheckType.DELETE_NON_DURABLE_QUEUE; +import static org.apache.activemq.artemis.core.security.CheckType.SEND; public class RoleTest extends Assert { diff --git a/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java similarity index 79% rename from activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java index 5b5afeb0b9..745306489b 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.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.group.impl; +package org.apache.activemq.artemis.core.server.group.impl; import javax.management.ObjectName; @@ -23,40 +23,40 @@ import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.BroadcastGroupConfiguration; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.api.core.management.ObjectNameBuilder; -import org.apache.activemq.core.config.BridgeConfiguration; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.DivertConfiguration; -import org.apache.activemq.core.management.impl.ActiveMQServerControlImpl; -import org.apache.activemq.core.messagecounter.MessageCounterManager; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.remoting.server.RemotingService; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.Divert; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.QueueFactory; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.Bridge; -import org.apache.activemq.core.server.cluster.BroadcastGroup; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.server.management.ManagementService; -import org.apache.activemq.core.server.management.Notification; -import org.apache.activemq.core.server.management.NotificationListener; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.transaction.ResourceManager; -import org.apache.activemq.spi.core.remoting.Acceptor; -import org.apache.activemq.tests.util.UnitTestCase; -import org.apache.activemq.utils.ConcurrentHashSet; -import org.apache.activemq.utils.ReusableLatch; +import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; +import org.apache.activemq.artemis.core.config.BridgeConfiguration; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.DivertConfiguration; +import org.apache.activemq.artemis.core.management.impl.ActiveMQServerControlImpl; +import org.apache.activemq.artemis.core.messagecounter.MessageCounterManager; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.remoting.server.RemotingService; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.server.Divert; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.Bridge; +import org.apache.activemq.artemis.core.server.cluster.BroadcastGroup; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.server.management.ManagementService; +import org.apache.activemq.artemis.core.server.management.Notification; +import org.apache.activemq.artemis.core.server.management.NotificationListener; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.transaction.ResourceManager; +import org.apache.activemq.artemis.spi.core.remoting.Acceptor; +import org.apache.activemq.artemis.tests.util.UnitTestCase; +import org.apache.activemq.artemis.utils.ConcurrentHashSet; +import org.apache.activemq.artemis.utils.ReusableLatch; import org.junit.Assert; import org.junit.Test; diff --git a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/EmbeddedServerTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/EmbeddedServerTest.java similarity index 82% rename from activemq-server/src/test/java/org/apache/activemq/core/server/impl/EmbeddedServerTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/EmbeddedServerTest.java index dfe8ac3bf1..38bcbc8b6a 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/EmbeddedServerTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/EmbeddedServerTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.server.impl; +package org.apache.activemq.artemis.core.server.impl; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServers; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java similarity index 96% rename from activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java index 8c6d1d2c17..3486694e61 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.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.impl; +package org.apache.activemq.artemis.core.server.impl; import java.io.InputStream; @@ -32,26 +32,26 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQPropertyConversionException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.filter.Filter; -import org.apache.activemq.core.message.BodyEncoder; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.cursor.PageSubscription; -import org.apache.activemq.core.server.Consumer; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.RoutingContext; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.transaction.Transaction; -import org.apache.activemq.tests.util.RandomUtil; -import org.apache.activemq.utils.LinkedListIterator; -import org.apache.activemq.utils.ReferenceCounter; -import org.apache.activemq.utils.TypedProperties; -import org.apache.activemq.utils.UUID; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.message.BodyEncoder; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.server.Consumer; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.RoutingContext; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.transaction.Transaction; +import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.apache.activemq.artemis.utils.LinkedListIterator; +import org.apache.activemq.artemis.utils.ReferenceCounter; +import org.apache.activemq.artemis.utils.TypedProperties; +import org.apache.activemq.artemis.utils.UUID; import org.junit.Assert; import org.junit.Test; diff --git a/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java similarity index 96% rename from activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java index d8d225e8e3..676aa20493 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.settings; +package org.apache.activemq.artemis.core.settings; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java similarity index 97% rename from activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java index 5d77739394..277b26e864 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.settings; +package org.apache.activemq.artemis.core.settings; import java.util.ArrayList; import java.util.HashSet; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository; -import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.artemis.core.security.Role; +import org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq.artemis.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/version/impl/VersionImplTest.java similarity index 98% rename from activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/core/version/impl/VersionImplTest.java index 3bc5c603be..5ad8f8f9a1 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/version/impl/VersionImplTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.version.impl; +package org.apache.activemq.artemis.core.version.impl; import org.junit.Test; diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/ColocatedActiveMQServer.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java similarity index 81% rename from activemq-server/src/test/java/org/apache/activemq/tests/util/ColocatedActiveMQServer.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java index 1a607a4eff..640b150886 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/ColocatedActiveMQServer.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests.util; +package org.apache.activemq.artemis.tests.util; import javax.management.MBeanServer; -import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.FileConfiguration; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.impl.AIOFileLockNodeManager; -import org.apache.activemq.core.server.impl.FileLockNodeManager; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.FileConfiguration; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.impl.AIOFileLockNodeManager; +import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; public class ColocatedActiveMQServer extends ActiveMQServerImpl diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/CountDownSessionFailureListener.java similarity index 88% rename from activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/CountDownSessionFailureListener.java index de37b243c5..ff5ee04400 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/CountDownSessionFailureListener.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests.util; +package org.apache.activemq.artemis.tests.util; import java.util.concurrent.CountDownLatch; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.SessionFailureListener; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.SessionFailureListener; public final class CountDownSessionFailureListener implements SessionFailureListener { diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/InVMNodeManagerServer.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/InVMNodeManagerServer.java similarity index 88% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/maven/InVMNodeManagerServer.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/InVMNodeManagerServer.java index 97d3f372f2..f56fa0dd52 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/InVMNodeManagerServer.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/InVMNodeManagerServer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.maven; +package org.apache.activemq.artemis.tests.util; import javax.management.MBeanServer; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; public final class InVMNodeManagerServer extends ActiveMQServerImpl { diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/RemoveFolder.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/RemoveFolder.java similarity index 96% rename from activemq-server/src/test/java/org/apache/activemq/tests/util/RemoveFolder.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/RemoveFolder.java index 0f33ffc0e9..e068467f2d 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/RemoveFolder.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/RemoveFolder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.activemq.tests.util; +package org.apache.activemq.artemis.tests.util; import java.io.File; diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServiceTestBase.java similarity index 91% rename from activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServiceTestBase.java index 1194b15a0a..3299edbaec 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServiceTestBase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests.util; +package org.apache.activemq.artemis.tests.util; import javax.management.MBeanServer; import java.io.File; @@ -27,52 +27,52 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.core.client.impl.Topology; -import org.apache.activemq.core.client.impl.TopologyMemberImpl; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.journal.PreparedTransactionInfo; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.impl.JournalFile; -import org.apache.activemq.core.journal.impl.JournalImpl; -import org.apache.activemq.core.journal.impl.JournalReaderCallback; -import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.QueueBinding; -import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq.core.remoting.impl.invm.InVMRegistry; -import org.apache.activemq.core.remoting.impl.invm.TransportConstants; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.ActiveMQServers; -import org.apache.activemq.core.server.NodeManager; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.server.cluster.RemoteQueueBinding; -import org.apache.activemq.core.server.impl.Activation; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.core.server.impl.SharedNothingBackupActivation; -import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.artemis.core.client.impl.Topology; +import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.core.journal.impl.JournalReaderCallback; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.Bindings; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.QueueBinding; +import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.ActiveMQServers; +import org.apache.activemq.artemis.core.server.NodeManager; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq.artemis.core.server.impl.Activation; +import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.artemis.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl; +import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -251,12 +251,12 @@ public abstract class ServiceTestBase extends UnitTestCase if (netty) { - params.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, - org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + node); + params.put(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + node); } else { - params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node); + params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node); } return params; @@ -271,8 +271,8 @@ public abstract class ServiceTestBase extends UnitTestCase Map server1Params = new HashMap(); - server1Params.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, - org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); return new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, server1Params); } @@ -286,8 +286,8 @@ public abstract class ServiceTestBase extends UnitTestCase Map server1Params = new HashMap(); - server1Params.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, - org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); return new TransportConfiguration(NETTY_CONNECTOR_FACTORY, server1Params); } diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SimpleStringTest.java similarity index 98% rename from activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SimpleStringTest.java index 5ca3528739..2f92aa82bf 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SimpleStringTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests.util; +package org.apache.activemq.artemis.tests.util; import org.junit.Test; @@ -23,8 +23,8 @@ import java.util.concurrent.CountDownLatch; import org.junit.Assert; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.utils.DataConstants; public class SimpleStringTest extends Assert { diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SingleServerTestBase.java similarity index 78% rename from activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SingleServerTestBase.java index cbf2702730..8751f2bdbd 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SingleServerTestBase.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests.util; +package org.apache.activemq.artemis.tests.util; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.server.ActiveMQServer; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.junit.Before; /** diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/UnitTestCase.java similarity index 94% rename from activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/UnitTestCase.java index 78070a95b9..0134d8e2ab 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/UnitTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests.util; +package org.apache.activemq.artemis.tests.util; import javax.naming.Context; import javax.transaction.xa.XAException; @@ -53,60 +53,60 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq.core.client.impl.ServerLocatorImpl; -import org.apache.activemq.core.config.ClusterConnectionConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.journal.PreparedTransactionInfo; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.impl.JournalImpl; -import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq.core.persistence.impl.journal.DescribeJournal; -import org.apache.activemq.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; -import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds; -import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.postoffice.PostOffice; -import org.apache.activemq.core.postoffice.QueueBinding; -import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq.core.remoting.impl.invm.InVMRegistry; -import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.apache.activemq.core.remoting.impl.netty.NettyConnector; -import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.ActiveMQMessageBundle; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.server.MessageReference; -import org.apache.activemq.core.server.Queue; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.server.cluster.ClusterConnection; -import org.apache.activemq.core.server.cluster.ClusterManager; -import org.apache.activemq.core.server.impl.ServerMessageImpl; -import org.apache.activemq.core.transaction.impl.XidImpl; -import org.apache.activemq.tests.CoreUnitTestCase; -import org.apache.activemq.utils.OrderedExecutorFactory; -import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.artemis.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq.artemis.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq.artemis.core.postoffice.Binding; +import org.apache.activemq.artemis.core.postoffice.Bindings; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.postoffice.QueueBinding; +import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; +import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.server.MessageReference; +import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.server.cluster.ClusterConnection; +import org.apache.activemq.artemis.core.server.cluster.ClusterManager; +import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.core.transaction.impl.XidImpl; +import org.apache.activemq.artemis.tests.CoreUnitTestCase; +import org.apache.activemq.artemis.utils.OrderedExecutorFactory; +import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/activemq-server/src/test/resources/ConfigurationTest-defaults.xml b/artemis-server/src/test/resources/ConfigurationTest-defaults.xml similarity index 100% rename from activemq-server/src/test/resources/ConfigurationTest-defaults.xml rename to artemis-server/src/test/resources/ConfigurationTest-defaults.xml diff --git a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml similarity index 88% rename from activemq-server/src/test/resources/ConfigurationTest-full-config.xml rename to artemis-server/src/test/resources/ConfigurationTest-full-config.xml index e55b522399..72b89e8c8f 100644 --- a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml +++ b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml @@ -34,7 +34,7 @@ Whatever Frog 32a10275cf4ab4e9 - org.apache.activemq.utils.DefaultSensitiveStringCodec + org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec true com.foo false @@ -51,12 +51,12 @@ 127 true - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor1 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor2 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor1 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor2 true @@ -142,7 +142,6 @@ 2 false true - 444 connector1 @@ -150,7 +149,6 @@ queue2 bridge-forwarding-address2 - 555 @@ -169,25 +167,24 @@ -

queues1
+
queues1
+ connector1 + 331 + 3370 + 321 + 123 + 3 + 0.25 + 10000 + 72 + true + false + 1 + 123 + connector1 - 331 - 3370 - 321 - 123 - 3 - 0.25 - 10000 - 72 - true - false - 1 - 222 - 123 - - connector1 - connector2 - + connector2 +
queues2
@@ -197,7 +194,6 @@ false true 2 - 333 456 diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml b/artemis-server/src/test/resources/InvalidConfigurationTest0.xml similarity index 98% rename from activemq-server/src/test/resources/InvalidConfigurationTest0.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest0.xml index ddc50d5d42..0efb6b3981 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml +++ b/artemis-server/src/test/resources/InvalidConfigurationTest0.xml @@ -66,8 +66,8 @@ 54321 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor1 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor2 diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml b/artemis-server/src/test/resources/InvalidConfigurationTest1.xml similarity index 98% rename from activemq-server/src/test/resources/InvalidConfigurationTest1.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest1.xml index cb599ccfc0..86ab74644f 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml +++ b/artemis-server/src/test/resources/InvalidConfigurationTest1.xml @@ -66,8 +66,8 @@ 54321 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor1 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor2 diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml b/artemis-server/src/test/resources/InvalidConfigurationTest2.xml similarity index 98% rename from activemq-server/src/test/resources/InvalidConfigurationTest2.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest2.xml index 7e45afca00..300f601226 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml +++ b/artemis-server/src/test/resources/InvalidConfigurationTest2.xml @@ -66,8 +66,8 @@ 54321 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor1 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor2 diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml b/artemis-server/src/test/resources/InvalidConfigurationTest3.xml similarity index 98% rename from activemq-server/src/test/resources/InvalidConfigurationTest3.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest3.xml index 19fa198988..00df30e3c4 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml +++ b/artemis-server/src/test/resources/InvalidConfigurationTest3.xml @@ -66,8 +66,8 @@ 54321 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor1 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor2 diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml b/artemis-server/src/test/resources/InvalidConfigurationTest4.xml similarity index 98% rename from activemq-server/src/test/resources/InvalidConfigurationTest4.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest4.xml index 21314b07d0..40e9af8ca5 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml +++ b/artemis-server/src/test/resources/InvalidConfigurationTest4.xml @@ -66,8 +66,8 @@ 54321 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor1 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor2 diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml b/artemis-server/src/test/resources/InvalidConfigurationTest5.xml similarity index 98% rename from activemq-server/src/test/resources/InvalidConfigurationTest5.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest5.xml index 3571a14b6c..ce7c56fd96 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml +++ b/artemis-server/src/test/resources/InvalidConfigurationTest5.xml @@ -66,8 +66,8 @@ 54321 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1 - org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor1 + org.apache.activemq.artemis.tests.unit.core.config.impl.TestInterceptor2 diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config.xml b/artemis-server/src/test/resources/colocated-hapolicy-config.xml similarity index 100% rename from activemq-server/src/test/resources/colocated-hapolicy-config.xml rename to artemis-server/src/test/resources/colocated-hapolicy-config.xml diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml b/artemis-server/src/test/resources/colocated-hapolicy-config2.xml similarity index 100% rename from activemq-server/src/test/resources/colocated-hapolicy-config2.xml rename to artemis-server/src/test/resources/colocated-hapolicy-config2.xml diff --git a/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml b/artemis-server/src/test/resources/divertRoutingNameNotRequired.xml similarity index 100% rename from activemq-server/src/test/resources/divertRoutingNameNotRequired.xml rename to artemis-server/src/test/resources/divertRoutingNameNotRequired.xml diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config.xml b/artemis-server/src/test/resources/live-only-hapolicy-config.xml similarity index 100% rename from activemq-server/src/test/resources/live-only-hapolicy-config.xml rename to artemis-server/src/test/resources/live-only-hapolicy-config.xml diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml b/artemis-server/src/test/resources/live-only-hapolicy-config2.xml similarity index 100% rename from activemq-server/src/test/resources/live-only-hapolicy-config2.xml rename to artemis-server/src/test/resources/live-only-hapolicy-config2.xml diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml b/artemis-server/src/test/resources/live-only-hapolicy-config3.xml similarity index 100% rename from activemq-server/src/test/resources/live-only-hapolicy-config3.xml rename to artemis-server/src/test/resources/live-only-hapolicy-config3.xml diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml b/artemis-server/src/test/resources/live-only-hapolicy-config4.xml similarity index 100% rename from activemq-server/src/test/resources/live-only-hapolicy-config4.xml rename to artemis-server/src/test/resources/live-only-hapolicy-config4.xml diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml b/artemis-server/src/test/resources/live-only-hapolicy-config5.xml similarity index 100% rename from activemq-server/src/test/resources/live-only-hapolicy-config5.xml rename to artemis-server/src/test/resources/live-only-hapolicy-config5.xml diff --git a/activemq-server/src/test/resources/logging.properties b/artemis-server/src/test/resources/logging.properties similarity index 90% rename from activemq-server/src/test/resources/logging.properties rename to artemis-server/src/test/resources/logging.properties index 5c39986aa2..0bb49a66f9 100644 --- a/activemq-server/src/test/resources/logging.properties +++ b/artemis-server/src/test/resources/logging.properties @@ -17,11 +17,11 @@ # Additional logger names to configure (root logger is always configured) # Root logger option -loggers=org.jboss.logging,org.apache.activemq.core.server +loggers=org.jboss.logging,org.apache.activemq.artemis.core.server # Dump system environment at boot by default logger.org.jboss.logging=TRACE -logger.org.apache.activemq.core.server=TRACE +logger.org.apache.activemq.artemis.core.server=TRACE # Root logger level logger.level=INFO @@ -45,7 +45,7 @@ handler.FILE.formatter=PATTERN # Console handler configuration -handler.TEST=org.apache.activemq.logs.AssertionLoggerHandler +handler.TEST=org.apache.activemq.artemis.logs.AssertionLoggerHandler handler.TEST.level=TRACE handler.TEST.formatter=PATTERN diff --git a/activemq-server/src/test/resources/replica-hapolicy-config.xml b/artemis-server/src/test/resources/replica-hapolicy-config.xml similarity index 100% rename from activemq-server/src/test/resources/replica-hapolicy-config.xml rename to artemis-server/src/test/resources/replica-hapolicy-config.xml diff --git a/activemq-server/src/test/resources/replica-hapolicy-config2.xml b/artemis-server/src/test/resources/replica-hapolicy-config2.xml similarity index 100% rename from activemq-server/src/test/resources/replica-hapolicy-config2.xml rename to artemis-server/src/test/resources/replica-hapolicy-config2.xml diff --git a/activemq-server/src/test/resources/replica-hapolicy-config3.xml b/artemis-server/src/test/resources/replica-hapolicy-config3.xml similarity index 100% rename from activemq-server/src/test/resources/replica-hapolicy-config3.xml rename to artemis-server/src/test/resources/replica-hapolicy-config3.xml diff --git a/activemq-server/src/test/resources/replicated-hapolicy-config.xml b/artemis-server/src/test/resources/replicated-hapolicy-config.xml similarity index 100% rename from activemq-server/src/test/resources/replicated-hapolicy-config.xml rename to artemis-server/src/test/resources/replicated-hapolicy-config.xml diff --git a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml b/artemis-server/src/test/resources/shared-store-master-hapolicy-config.xml similarity index 100% rename from activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml rename to artemis-server/src/test/resources/shared-store-master-hapolicy-config.xml diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config.xml similarity index 100% rename from activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml rename to artemis-server/src/test/resources/shared-store-slave-hapolicy-config.xml diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config2.xml similarity index 100% rename from activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml rename to artemis-server/src/test/resources/shared-store-slave-hapolicy-config2.xml diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config3.xml similarity index 100% rename from activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml rename to artemis-server/src/test/resources/shared-store-slave-hapolicy-config3.xml diff --git a/activemq-service-extensions/pom.xml b/artemis-service-extensions/pom.xml similarity index 89% rename from activemq-service-extensions/pom.xml rename to artemis-service-extensions/pom.xml index 19262e0227..f4650a0f84 100644 --- a/activemq-service-extensions/pom.xml +++ b/artemis-service-extensions/pom.xml @@ -19,23 +19,23 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-service-extensions + artemis-service-extensions jar ActiveMQ Artemis Service Extensions org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} @@ -68,7 +68,7 @@ org.apache.activemq - activemq-commons + artemis-commons ${project.version} diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ActiveMQServiceExtensionLogger.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/ActiveMQServiceExtensionLogger.java similarity index 96% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ActiveMQServiceExtensionLogger.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/ActiveMQServiceExtensionLogger.java index 76915e7ce5..ecfb5a15d3 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ActiveMQServiceExtensionLogger.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/ActiveMQServiceExtensionLogger.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.activemq.service.extensions; +package org.apache.activemq.artemis.service.extensions; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ServiceUtils.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/ServiceUtils.java similarity index 87% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ServiceUtils.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/ServiceUtils.java index bd05652470..15513c66a6 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ServiceUtils.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/ServiceUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions; +package org.apache.activemq.artemis.service.extensions; import javax.transaction.TransactionManager; import javax.transaction.xa.XAResource; @@ -22,10 +22,10 @@ import java.util.Iterator; import java.util.Map; import java.util.ServiceLoader; -import org.apache.activemq.service.extensions.transactions.TransactionManagerLocator; -import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapper; -import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapperFactory; -import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapperFactoryImpl; +import org.apache.activemq.artemis.service.extensions.transactions.TransactionManagerLocator; +import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapper; +import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapperFactory; +import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapperFactoryImpl; public class ServiceUtils { diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/transactions/TransactionManagerLocator.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/transactions/TransactionManagerLocator.java similarity index 93% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/transactions/TransactionManagerLocator.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/transactions/TransactionManagerLocator.java index e65be6f52a..41d8f98a9e 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/transactions/TransactionManagerLocator.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/transactions/TransactionManagerLocator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.transactions; +package org.apache.activemq.artemis.service.extensions.transactions; import javax.transaction.TransactionManager; diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapper.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapper.java similarity index 95% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapper.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapper.java index a61eea83a2..c0709a0db1 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapper.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.xa; +package org.apache.activemq.artemis.service.extensions.xa; import javax.transaction.xa.XAResource; diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java similarity index 94% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java index a88c99aa21..e64fd7c3e6 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.xa; +package org.apache.activemq.artemis.service.extensions.xa; import javax.transaction.xa.XAResource; import java.util.Map; diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java similarity index 95% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java index 1bd0e399b9..809ec08113 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.xa; +package org.apache.activemq.artemis.service.extensions.xa; import javax.transaction.xa.XAResource; import java.util.Map; diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java similarity index 89% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java index 93531e90c4..92ac75ade3 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.xa; +package org.apache.activemq.artemis.service.extensions.xa; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -46,12 +46,12 @@ public class ActiveMQXAResourceWrapperImpl implements ActiveMQXAResourceWrapper { this.xaResource = xaResource; //this.productName = ActiveMQResourceAdapter.PRODUCT_NAME; - this.productName = (String) properties.get(ActiveMQXAResourceWrapper.ACTIVEMQ_PRODUCT_NAME); + this.productName = (String) properties.get(ACTIVEMQ_PRODUCT_NAME); //this.productVersion = VersionLoader.getVersion().getFullVersion(); - this.productVersion = (String) properties.get(ActiveMQXAResourceWrapper.ACTIVEMQ_PRODUCT_VERSION); + this.productVersion = (String) properties.get(ACTIVEMQ_PRODUCT_VERSION); - this.jndiNameNodeId = properties.get(ActiveMQXAResourceWrapper.ACTIVEMQ_JNDI_NAME) + - " NodeId:" + properties.get(ActiveMQXAResourceWrapper.ACTIVEMQ_NODE_ID); + this.jndiNameNodeId = properties.get(ACTIVEMQ_JNDI_NAME) + + " NodeId:" + properties.get(ACTIVEMQ_NODE_ID); } public XAResource getResource() diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistry.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQRegistry.java similarity index 93% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistry.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQRegistry.java index 8507765ae6..aa17179bfd 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistry.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQRegistry.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.activemq.service.extensions.xa.recovery; +package org.apache.activemq.artemis.service.extensions.xa.recovery; public interface ActiveMQRegistry { diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistryImpl.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQRegistryImpl.java similarity index 95% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistryImpl.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQRegistryImpl.java index 870ca0ca69..01268ad9e0 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistryImpl.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQRegistryImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.activemq.service.extensions.xa.recovery; +package org.apache.activemq.artemis.service.extensions.xa.recovery; public class ActiveMQRegistryImpl implements ActiveMQRegistry { diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java similarity index 97% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java index 9ae511f35c..15707ae912 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.xa.recovery; +package org.apache.activemq.artemis.service.extensions.xa.recovery; -import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java similarity index 91% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java index 3616976149..7e4c3bda61 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.xa.recovery; +package org.apache.activemq.artemis.service.extensions.xa.recovery; import javax.transaction.xa.XAResource; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; /** * A XAResourceRecovery instance that can be used to recover any JMS provider. @@ -31,19 +31,19 @@ import org.apache.activemq.api.core.TransportConfiguration; * To enable this add the following to the jbossts-properties file * 
  * <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ1"
- *                 value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"/>
+ *                 value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"/>
  *
*

* you'll need something like this if the ActiveMQ Server is remote * 

  *      <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
- *                  value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616"/>
+ *                  value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616"/>
  *
*

* you'll need something like this if the ActiveMQ Server is remote and has failover configured * 

  *             <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
- *                       value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=61617"/>
+ *                       value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=61617"/>
  *
*/ public class ActiveMQXAResourceRecovery diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java similarity index 95% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java index dc3e1c81b6..9ce285b61f 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.xa.recovery; +package org.apache.activemq.artemis.service.extensions.xa.recovery; import java.util.Arrays; @@ -22,14 +22,14 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.ActiveMQExceptionType; -import org.apache.activemq.api.core.ActiveMQNotConnectedException; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.api.core.client.SessionFailureListener; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.core.client.SessionFailureListener; /** * XAResourceWrapper. diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/XARecoveryConfig.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java similarity index 92% rename from activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/XARecoveryConfig.java rename to artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java index 2f3a94837c..67f801fac0 100644 --- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/XARecoveryConfig.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.xa.recovery; +package org.apache.activemq.artemis.service.extensions.xa.recovery; import java.util.Arrays; -import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; /** * diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/DummyTransactionManagerLocator.java b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/transactions/DummyTransactionManagerLocator.java similarity index 93% rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/DummyTransactionManagerLocator.java rename to artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/transactions/DummyTransactionManagerLocator.java index 6c4156fd21..c6ce17516e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/DummyTransactionManagerLocator.java +++ b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/transactions/DummyTransactionManagerLocator.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests.util.transactions; +package org.apache.activemq.artemis.service.extensions.tests.transactions; + +import org.apache.activemq.artemis.service.extensions.transactions.TransactionManagerLocator; import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; @@ -25,8 +27,6 @@ import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import org.apache.activemq.service.extensions.transactions.TransactionManagerLocator; - public class DummyTransactionManagerLocator implements TransactionManagerLocator,TransactionManager { @Override diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/TransactionManagerLocatorTest.java b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/transactions/TransactionManagerLocatorTest.java similarity index 88% rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/TransactionManagerLocatorTest.java rename to artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/transactions/TransactionManagerLocatorTest.java index 390fd1fffa..5216a00f3c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/TransactionManagerLocatorTest.java +++ b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/transactions/TransactionManagerLocatorTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tests.util.transactions; +package org.apache.activemq.artemis.service.extensions.tests.transactions; -import org.apache.activemq.service.extensions.ServiceUtils; +import org.apache.activemq.artemis.service.extensions.ServiceUtils; import org.junit.Assert; import org.junit.Test; diff --git a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java similarity index 89% rename from activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java rename to artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java index 052957cc48..32cd969249 100644 --- a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java +++ b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.tests.xa; +package org.apache.activemq.artemis.service.extensions.tests.xa; import javax.transaction.xa.XAResource; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapper; -import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapperImpl; +import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapper; +import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapperImpl; import org.junit.Test; import static org.jgroups.util.Util.assertEquals; diff --git a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/MockActiveMQResourceWrapperFactory.java b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/MockActiveMQResourceWrapperFactory.java similarity index 82% rename from activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/MockActiveMQResourceWrapperFactory.java rename to artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/MockActiveMQResourceWrapperFactory.java index 5933b5a031..1d6f0adf34 100644 --- a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/MockActiveMQResourceWrapperFactory.java +++ b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/MockActiveMQResourceWrapperFactory.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.tests.xa; +package org.apache.activemq.artemis.service.extensions.tests.xa; import javax.transaction.xa.XAResource; import java.util.Map; -import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapper; -import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapperFactory; +import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapper; +import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapperFactory; public class MockActiveMQResourceWrapperFactory implements ActiveMQXAResourceWrapperFactory { diff --git a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/MockXAResource.java b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/MockXAResource.java similarity index 96% rename from activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/MockXAResource.java rename to artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/MockXAResource.java index 8651a985df..0d5c25c393 100644 --- a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/MockXAResource.java +++ b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/MockXAResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.tests.xa; +package org.apache.activemq.artemis.service.extensions.tests.xa; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; diff --git a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/ServiceUtilsTest.java b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/ServiceUtilsTest.java similarity index 88% rename from activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/ServiceUtilsTest.java rename to artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/ServiceUtilsTest.java index a278a3b7ca..af2819a6b7 100644 --- a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/xa/ServiceUtilsTest.java +++ b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/ServiceUtilsTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.service.extensions.tests.xa; +package org.apache.activemq.artemis.service.extensions.tests.xa; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.service.extensions.ServiceUtils; -import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapperFactory; -import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapperFactoryImpl; +import org.apache.activemq.artemis.service.extensions.ServiceUtils; +import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapperFactory; +import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapperFactoryImpl; import org.junit.Test; import static org.jgroups.util.Util.assertTrue; diff --git a/artemis-service-extensions/src/test/resources/META-INF/services/org.apache.activemq.artemis.service.extensions.transactions.TransactionManagerLocator b/artemis-service-extensions/src/test/resources/META-INF/services/org.apache.activemq.artemis.service.extensions.transactions.TransactionManagerLocator new file mode 100644 index 0000000000..1f52699745 --- /dev/null +++ b/artemis-service-extensions/src/test/resources/META-INF/services/org.apache.activemq.artemis.service.extensions.transactions.TransactionManagerLocator @@ -0,0 +1 @@ +org.apache.activemq.artemis.service.extensions.tests.transactions.DummyTransactionManagerLocator \ No newline at end of file diff --git a/activemq-tools/pom.xml b/artemis-tools/pom.xml similarity index 89% rename from activemq-tools/pom.xml rename to artemis-tools/pom.xml index affc8d013f..d22140194d 100644 --- a/activemq-tools/pom.xml +++ b/artemis-tools/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-tools + artemis-tools jar ActiveMQ Artemis Tools @@ -40,12 +40,12 @@ org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} @@ -61,7 +61,7 @@ - org.apache.activemq.tools.Main + org.apache.activemq.artemis.tools.Main diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/ActiveMQToolsLogger.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/ActiveMQToolsLogger.java similarity index 97% rename from activemq-tools/src/main/java/org/apache/activemq/tools/ActiveMQToolsLogger.java rename to artemis-tools/src/main/java/org/apache/activemq/artemis/tools/ActiveMQToolsLogger.java index 4c8e49f100..9646049807 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/ActiveMQToolsLogger.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/ActiveMQToolsLogger.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tools; +package org.apache.activemq.artemis.tools; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/DataTool.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/DataTool.java similarity index 95% rename from activemq-tools/src/main/java/org/apache/activemq/tools/DataTool.java rename to artemis-tools/src/main/java/org/apache/activemq/artemis/tools/DataTool.java index 8c63598b81..58a6b1e826 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/DataTool.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/DataTool.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tools; +package org.apache.activemq.artemis.tools; import java.io.File; import java.util.ArrayList; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.impl.JournalImpl; -import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; public class DataTool { diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/ExportJournal.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/ExportJournal.java similarity index 93% rename from activemq-tools/src/main/java/org/apache/activemq/tools/ExportJournal.java rename to artemis-tools/src/main/java/org/apache/activemq/artemis/tools/ExportJournal.java index 2742b0a87d..d2c9339ab5 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/ExportJournal.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/ExportJournal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tools; +package org.apache.activemq.artemis.tools; import java.io.BufferedOutputStream; import java.io.File; @@ -22,13 +22,13 @@ import java.io.FileOutputStream; import java.io.PrintStream; import java.util.List; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.impl.JournalFile; -import org.apache.activemq.core.journal.impl.JournalImpl; -import org.apache.activemq.core.journal.impl.JournalReaderCallback; -import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq.utils.Base64; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.core.journal.impl.JournalReaderCallback; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.artemis.utils.Base64; /** * Use this class to export the journal data. You can use it as a main class or through its static method {@link #exportJournal(String, String, String, int, int, String)} diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/ImportJournal.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/ImportJournal.java similarity index 96% rename from activemq-tools/src/main/java/org/apache/activemq/tools/ImportJournal.java rename to artemis-tools/src/main/java/org/apache/activemq/artemis/tools/ImportJournal.java index ac1e24f1cf..b1d028415a 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/ImportJournal.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/ImportJournal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tools; +package org.apache.activemq.artemis.tools; import java.io.BufferedReader; import java.io.File; @@ -27,11 +27,11 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.impl.JournalImpl; -import org.apache.activemq.core.journal.impl.JournalRecord; -import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq.utils.Base64; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.core.journal.impl.JournalRecord; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.artemis.utils.Base64; /** * Use this class to import the journal data from a listed file. You can use it as a main class or @@ -47,7 +47,7 @@ import org.apache.activemq.utils.Base64; * Example: * * 
- * java -cp activemq-core.jar org.apache.activemq.core.journal.impl.ExportJournal /journalDir activemq-data amq 2 10485760 /tmp/export.dat
+ * java -cp activemq-core.jar org.apache.activemq.artemis.core.journal.impl.ExportJournal /journalDir activemq-data amq 2 10485760 /tmp/export.dat
  *
*/ public class ImportJournal diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/Main.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/Main.java similarity index 99% rename from activemq-tools/src/main/java/org/apache/activemq/tools/Main.java rename to artemis-tools/src/main/java/org/apache/activemq/artemis/tools/Main.java index 9eee57fab9..c239b15ab5 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/Main.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/Main.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tools; +package org.apache.activemq.artemis.tools; public class Main { diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/PrintData.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/PrintData.java similarity index 90% rename from activemq-tools/src/main/java/org/apache/activemq/tools/PrintData.java rename to artemis-tools/src/main/java/org/apache/activemq/artemis/tools/PrintData.java index 7d6ad5364f..4b92badc7a 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/PrintData.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/PrintData.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tools; +package org.apache.activemq.artemis.tools; import java.io.File; -import org.apache.activemq.core.persistence.impl.journal.DescribeJournal; -import org.apache.activemq.core.server.impl.FileLockNodeManager; +import org.apache.activemq.artemis.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager; /** - * Writes a human-readable interpretation of the contents of a ActiveMQ {@link org.apache.activemq.core.journal.Journal}. + * Writes a human-readable interpretation of the contents of a ActiveMQ {@link org.apache.activemq.artemis.core.journal.Journal}. *

* To run this class with Maven, use: * diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/PrintPages.java similarity index 82% rename from activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java rename to artemis-tools/src/main/java/org/apache/activemq/artemis/tools/PrintPages.java index 30dfe02c7d..ed4dcdc844 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/PrintPages.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tools; +package org.apache.activemq.artemis.tools; import java.util.ArrayList; import java.util.HashMap; @@ -27,34 +27,34 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.journal.PreparedTransactionInfo; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.impl.JournalImpl; -import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.PagingStoreFactory; -import org.apache.activemq.core.paging.cursor.PagePosition; -import org.apache.activemq.core.paging.cursor.impl.PagePositionImpl; -import org.apache.activemq.core.paging.impl.Page; -import org.apache.activemq.core.paging.impl.PageTransactionInfoImpl; -import org.apache.activemq.core.paging.impl.PagingManagerImpl; -import org.apache.activemq.core.paging.impl.PagingStoreFactoryNIO; -import org.apache.activemq.core.persistence.StorageManager; -import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; -import org.apache.activemq.core.persistence.impl.nullpm.NullStorageManager; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository; -import org.apache.activemq.utils.ExecutorFactory; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.PagingStoreFactory; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq.artemis.core.paging.impl.Page; +import org.apache.activemq.artemis.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq.artemis.core.paging.impl.PagingManagerImpl; +import org.apache.activemq.artemis.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; +import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq.artemis.utils.ExecutorFactory; public class PrintPages // NO_UCD (unused code) { diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/TransferQueue.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/TransferQueue.java similarity index 90% rename from activemq-tools/src/main/java/org/apache/activemq/tools/TransferQueue.java rename to artemis-tools/src/main/java/org/apache/activemq/artemis/tools/TransferQueue.java index e8ee4579a9..d13aa609c8 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/TransferQueue.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/TransferQueue.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tools; +package org.apache.activemq.artemis.tools; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; public class TransferQueue // NO_UCD (unused code) { diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataConstants.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataConstants.java similarity index 99% rename from activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataConstants.java rename to artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataConstants.java index 8881df163b..34fe96cdf5 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataConstants.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataConstants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tools; +package org.apache.activemq.artemis.tools; /** * The constants shared by org.apache.activemq.tools.XmlDataImporter and diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataExporter.java similarity index 91% rename from activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java rename to artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataExporter.java index 9aa5603770..37829a3e99 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataExporter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tools; +package org.apache.activemq.artemis.tools; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; @@ -36,61 +36,61 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.ActiveMQBuffer; -import org.apache.activemq.api.core.ActiveMQBuffers; -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.jms.JMSFactoryType; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.journal.Journal; -import org.apache.activemq.core.journal.PreparedTransactionInfo; -import org.apache.activemq.core.journal.RecordInfo; -import org.apache.activemq.core.journal.SequentialFileFactory; -import org.apache.activemq.core.journal.TransactionFailureCallback; -import org.apache.activemq.core.journal.impl.JournalImpl; -import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq.core.message.BodyEncoder; -import org.apache.activemq.core.paging.PagedMessage; -import org.apache.activemq.core.paging.PagingManager; -import org.apache.activemq.core.paging.PagingStore; -import org.apache.activemq.core.paging.PagingStoreFactory; -import org.apache.activemq.core.paging.cursor.PagePosition; -import org.apache.activemq.core.paging.cursor.impl.PagePositionImpl; -import org.apache.activemq.core.paging.impl.Page; -import org.apache.activemq.core.paging.impl.PageTransactionInfoImpl; -import org.apache.activemq.core.paging.impl.PagingManagerImpl; -import org.apache.activemq.core.paging.impl.PagingStoreFactoryNIO; -import org.apache.activemq.core.persistence.impl.journal.DescribeJournal; -import org.apache.activemq.core.persistence.impl.journal.DescribeJournal.MessageDescribe; -import org.apache.activemq.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; -import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.AckDescribe; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; -import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PersistentQueueBindingEncoding; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.core.server.JournalType; -import org.apache.activemq.core.server.LargeServerMessage; -import org.apache.activemq.core.server.ServerMessage; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository; -import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory; -import org.apache.activemq.jms.persistence.config.PersistedDestination; -import org.apache.activemq.jms.persistence.config.PersistedBindings; -import org.apache.activemq.jms.persistence.config.PersistedType; -import org.apache.activemq.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; -import org.apache.activemq.utils.Base64; -import org.apache.activemq.utils.ExecutorFactory; +import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ActiveMQBuffers; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.journal.Journal; +import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.TransactionFailureCallback; +import org.apache.activemq.artemis.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.artemis.core.message.BodyEncoder; +import org.apache.activemq.artemis.core.paging.PagedMessage; +import org.apache.activemq.artemis.core.paging.PagingManager; +import org.apache.activemq.artemis.core.paging.PagingStore; +import org.apache.activemq.artemis.core.paging.PagingStoreFactory; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq.artemis.core.paging.impl.Page; +import org.apache.activemq.artemis.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq.artemis.core.paging.impl.PagingManagerImpl; +import org.apache.activemq.artemis.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq.artemis.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq.artemis.core.persistence.impl.journal.DescribeJournal.MessageDescribe; +import org.apache.activemq.artemis.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.AckDescribe; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.PersistentQueueBindingEncoding; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.core.server.JournalType; +import org.apache.activemq.artemis.core.server.LargeServerMessage; +import org.apache.activemq.artemis.core.server.ServerMessage; +import org.apache.activemq.artemis.core.settings.HierarchicalRepository; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination; +import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings; +import org.apache.activemq.artemis.jms.persistence.config.PersistedType; +import org.apache.activemq.artemis.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; +import org.apache.activemq.artemis.utils.Base64; +import org.apache.activemq.artemis.utils.ExecutorFactory; /** * Read the journal, page, and large-message data from a stopped instance of ActiveMQ and save it in an XML format to * a file. It uses the StAX javax.xml.stream.XMLStreamWriter for speed and simplicity. Output can be - * read by org.apache.activemq.core.persistence.impl.journal.XmlDataImporter. + * read by org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataImporter. */ public final class XmlDataExporter { diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataImporter.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataImporter.java similarity index 96% rename from activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataImporter.java rename to artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataImporter.java index baf6a28bce..8ce2563f05 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataImporter.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataImporter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.tools; +package org.apache.activemq.artemis.tools; import javax.xml.stream.XMLInputFactory; @@ -34,26 +34,27 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientRequestor; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.api.core.management.ManagementHelper; -import org.apache.activemq.api.core.management.ResourceNames; -import org.apache.activemq.core.message.impl.MessageImpl; -import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.utils.Base64; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientRequestor; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.core.management.ManagementHelper; +import org.apache.activemq.artemis.api.core.management.ResourceNames; +import org.apache.activemq.artemis.core.message.impl.MessageImpl; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; +import org.apache.activemq.artemis.utils.UUIDGenerator; +import org.apache.activemq.artemis.utils.Base64; /** - * Read XML output from org.apache.activemq.core.persistence.impl.journal.XmlDataExporter, create a core session, and + * Read XML output from org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataExporter, create a core session, and * send the messages to a running instance of ActiveMQ. It uses the StAX javax.xml.stream.XMLStreamReader * for speed and simplicity. */ @@ -86,7 +87,7 @@ public final class XmlDataImporter /** * This is the normal constructor for programmatic access to the - * org.apache.activemq.core.persistence.impl.journal.XmlDataImporter if the session passed + * org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataImporter if the session passed * in uses auto-commit for sends. *

* If the session needs to be transactional then use the constructor which takes 2 sessions. @@ -102,7 +103,7 @@ public final class XmlDataImporter /** * This is the normal constructor for programmatic access to the - * org.apache.activemq.core.persistence.impl.journal.XmlDataImporter if the session passed + * org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataImporter if the session passed * in uses auto-commit for sends. *

* If the session needs to be transactional then use the constructor which takes 2 sessions. @@ -240,7 +241,7 @@ public final class XmlDataImporter Byte priority = 0; Long expiration = 0L; Long timestamp = 0L; - org.apache.activemq.utils.UUID userId = null; + org.apache.activemq.artemis.utils.UUID userId = null; ArrayList queues = new ArrayList<>(); // get message's attributes @@ -262,7 +263,7 @@ public final class XmlDataImporter timestamp = Long.parseLong(reader.getAttributeValue(i)); break; case XmlDataConstants.MESSAGE_USER_ID: - userId = org.apache.activemq.utils.UUIDGenerator.getInstance().generateUUID(); + userId = UUIDGenerator.getInstance().generateUUID(); break; } } diff --git a/activemq-web/pom.xml b/artemis-web/pom.xml similarity index 88% rename from activemq-web/pom.xml rename to artemis-web/pom.xml index 96fa59aaa0..cbb18103a3 100644 --- a/activemq-web/pom.xml +++ b/artemis-web/pom.xml @@ -19,11 +19,11 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-web + artemis-web jar ActiveMQ Artemis Web @@ -34,12 +34,12 @@ org.apache.activemq - activemq-dto + artemis-dto ${project.version} org.apache.activemq - activemq-bootstrap + artemis-bootstrap ${project.version} @@ -60,7 +60,7 @@ org.apache.activemq - activemq-commons + artemis-commons ${project.version} diff --git a/activemq-web/src/main/java/org/apache/activemq/component/WebServerComponent.java b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java similarity index 92% rename from activemq-web/src/main/java/org/apache/activemq/component/WebServerComponent.java rename to artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java index 310bf1b1aa..665f03bab3 100644 --- a/activemq-web/src/main/java/org/apache/activemq/component/WebServerComponent.java +++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.component; +package org.apache.activemq.artemis.component; -import org.apache.activemq.components.ExternalComponent; -import org.apache.activemq.dto.AppDTO; -import org.apache.activemq.dto.ComponentDTO; -import org.apache.activemq.dto.WebServerDTO; +import org.apache.activemq.artemis.components.ExternalComponent; +import org.apache.activemq.artemis.dto.AppDTO; +import org.apache.activemq.artemis.dto.ComponentDTO; +import org.apache.activemq.artemis.dto.WebServerDTO; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.DefaultHandler; diff --git a/activemq-web/src/test/java/org/apache/activemq/test/WebServerComponentTest.java b/artemis-web/src/test/java/org/apache/activemq/artemis/test/WebServerComponentTest.java similarity index 96% rename from activemq-web/src/test/java/org/apache/activemq/test/WebServerComponentTest.java rename to artemis-web/src/test/java/org/apache/activemq/artemis/test/WebServerComponentTest.java index c170635bca..71e1860cf2 100644 --- a/activemq-web/src/test/java/org/apache/activemq/test/WebServerComponentTest.java +++ b/artemis-web/src/test/java/org/apache/activemq/artemis/test/WebServerComponentTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.test; +package org.apache.activemq.artemis.test; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; @@ -33,8 +33,8 @@ import io.netty.handler.codec.http.HttpObject; import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpVersion; import io.netty.util.CharsetUtil; -import org.apache.activemq.component.WebServerComponent; -import org.apache.activemq.dto.WebServerDTO; +import org.apache.activemq.artemis.component.WebServerComponent; +import org.apache.activemq.artemis.dto.WebServerDTO; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/activemq-web/src/test/resources/webapps/WebServerComponentTest.txt b/artemis-web/src/test/resources/webapps/WebServerComponentTest.txt similarity index 100% rename from activemq-web/src/test/resources/webapps/WebServerComponentTest.txt rename to artemis-web/src/test/resources/webapps/WebServerComponentTest.txt diff --git a/activemq-website/pom.xml b/artemis-website/pom.xml similarity index 85% rename from activemq-website/pom.xml rename to artemis-website/pom.xml index ebd800e7de..19626798ce 100644 --- a/activemq-website/pom.xml +++ b/artemis-website/pom.xml @@ -19,43 +19,43 @@ org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-website + artemis-website jar ActiveMQ Artemis Web org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} org.apache.activemq - activemq-journal + artemis-journal ${project.version} org.apache.activemq - activemq-selector + artemis-selector ${project.version} @@ -88,16 +88,16 @@ - org.apache.activemq:activemq-core-client - org.apache.activemq:activemq-jms-client - org.apache.activemq:activemq-server - org.apache.activemq:activemq-jms-server - org.apache.activemq:activemq-journal - org.apache.activemq:activemq-selector + org.apache.activemq:artemis-core-client + org.apache.activemq:artemis-jms-client + org.apache.activemq:artemis-server + org.apache.activemq:artemis-jms-server + org.apache.activemq:artemis-journal + org.apache.activemq:artemis-selector false true - org.apache.activemq.core:org.apache.activemq.utils + org.apache.activemq.artemis.core:org.apache.activemq.artemis.utils diff --git a/activemq-website/src/main/resources/examples/index.html b/artemis-website/src/main/resources/examples/index.html similarity index 92% rename from activemq-website/src/main/resources/examples/index.html rename to artemis-website/src/main/resources/examples/index.html index 4bd3ac77d7..2c2a7469fd 100644 --- a/activemq-website/src/main/resources/examples/index.html +++ b/artemis-website/src/main/resources/examples/index.html @@ -30,7 +30,7 @@

@@ -41,10 +41,10 @@
-

Apache ActiveMQ Examples

+

Apache ActiveMQ Artemis Examples

-

Apache ActiveMQ comes with over 90 runnable examples. These can be found in the examples directory in the root of the - distribution folder. There are examples covering JMS as well as all the protocols and functionality that Apache ActiveMQ +

Apache ActiveMQ Artemis comes with over 90 runnable examples. These can be found in the examples directory in the root of the + distribution folder. There are examples covering JMS as well as all the protocols and functionality that Apache ActiveMQ Artemis supports.

Each example has its own instructions as to how they can be run, but for most of them it is as simple as running diff --git a/activemq-website/src/main/resources/images/activemq-logo.png b/artemis-website/src/main/resources/images/activemq-logo.png similarity index 100% rename from activemq-website/src/main/resources/images/activemq-logo.png rename to artemis-website/src/main/resources/images/activemq-logo.png diff --git a/activemq-website/src/main/resources/index.html b/artemis-website/src/main/resources/index.html similarity index 91% rename from activemq-website/src/main/resources/index.html rename to artemis-website/src/main/resources/index.html index 9b5a623476..7ae3fcb338 100644 --- a/activemq-website/src/main/resources/index.html +++ b/artemis-website/src/main/resources/index.html @@ -30,7 +30,7 @@

@@ -40,7 +40,7 @@ ActiveMQ logo
-

ActiveMQ 6.0

+

ActiveMQ Artemis

ActiveMQ's next generation of messaging
@@ -53,7 +53,7 @@
  • API
  • User Manual
  • Examples
    • -
  • Apache ActiveMQ Artemis Website
    • +
  • Apache ActiveMQ Artemis Website
    • diff --git a/activemq-website/src/main/resources/styles/impact/css/pygmentize.css b/artemis-website/src/main/resources/styles/impact/css/pygmentize.css similarity index 100% rename from activemq-website/src/main/resources/styles/impact/css/pygmentize.css rename to artemis-website/src/main/resources/styles/impact/css/pygmentize.css diff --git a/activemq-website/src/main/resources/styles/impact/css/site.css b/artemis-website/src/main/resources/styles/impact/css/site.css similarity index 100% rename from activemq-website/src/main/resources/styles/impact/css/site.css rename to artemis-website/src/main/resources/styles/impact/css/site.css diff --git a/activemq-website/src/main/resources/user-manual/index.html b/artemis-website/src/main/resources/user-manual/index.html similarity index 94% rename from activemq-website/src/main/resources/user-manual/index.html rename to artemis-website/src/main/resources/user-manual/index.html index 64903181c0..338e9569d7 100644 --- a/activemq-website/src/main/resources/user-manual/index.html +++ b/artemis-website/src/main/resources/user-manual/index.html @@ -19,7 +19,7 @@ under the License.

    User Manual

    -

    If you are seeing this message, it is because the User Manual was not built during the Apache ActiveMQ Artemis build. To +

    If you are seeing this message, it is because the User Manual was not built during the Apache ActiveMQ Artemis-6 build. To build Apache ActiveMQ Artemis with the User Manual you must use the maven release profile: mvn clean install -Prelease.

    diff --git a/activemq_doap.rdf b/artemis_doap.rdf similarity index 100% rename from activemq_doap.rdf rename to artemis_doap.rdf diff --git a/distribution/activemq/pom.xml b/distribution/artemis/pom.xml similarity index 85% rename from distribution/activemq/pom.xml rename to distribution/artemis/pom.xml index 5c37416652..8a8fa65463 100644 --- a/distribution/activemq/pom.xml +++ b/distribution/artemis/pom.xml @@ -21,8 +21,8 @@ org.apache.activemq - activemq-artemis-distribution - 10.0.0-SNAPSHOT + artemis-distribution + 1.0.0-SNAPSHOT apache-activemq-artemis @@ -39,97 +39,97 @@ org.apache.activemq - activemq-boot + artemis-boot ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-dto + artemis-dto ${project.version} org.apache.activemq - activemq-bootstrap + artemis-bootstrap ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-tools + artemis-tools ${project.version} org.apache.activemq - activemq-ra + artemis-ra ${project.version} org.apache.activemq - activemq-spring-integration + artemis-spring-integration ${project.version} org.apache.activemq - activemq-vertx-integration + artemis-vertx-integration ${project.version} org.apache.activemq.rest - activemq-rest + artemis-rest ${project.version} org.apache.activemq - activemq-aerogear-integration + artemis-aerogear-integration ${project.version} org.apache.activemq - activemq-web + artemis-web ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-amqp-protocol + artemis-amqp-protocol ${project.version} org.apache.activemq - activemq-stomp-protocol + artemis-stomp-protocol ${project.version} org.apache.activemq - activemq-openwire-protocol + artemis-openwire-protocol ${project.version} org.apache.activemq - activemq-native + artemis-native ${project.version} org.apache.activemq - activemq-website + artemis-website ${project.version} @@ -173,7 +173,7 @@ org.apache.activemq - activemq-website + artemis-website ${project.version} javadoc diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/artemis/src/main/assembly/dep.xml similarity index 76% rename from distribution/activemq/src/main/assembly/dep.xml rename to distribution/artemis/src/main/assembly/dep.xml index c792469b9c..1ca9844ee3 100644 --- a/distribution/activemq/src/main/assembly/dep.xml +++ b/distribution/artemis/src/main/assembly/dep.xml @@ -37,7 +37,7 @@ false false - org.apache.activemq:activemq-boot + org.apache.activemq:artemis-boot @@ -47,25 +47,25 @@ - org.apache.activemq:activemq-bootstrap - org.apache.activemq:activemq-commons - org.apache.activemq:activemq-core-client - org.apache.activemq:activemq-dto - org.apache.activemq:activemq-jms-client - org.apache.activemq:activemq-jms-server - org.apache.activemq:activemq-journal - org.apache.activemq:activemq-native - org.apache.activemq:activemq-amqp-protocol - org.apache.activemq:activemq-openwire-protocol - org.apache.activemq:activemq-proton-plug - org.apache.activemq:activemq-stomp-protocol - org.apache.activemq:activemq-ra - org.apache.activemq:activemq-selector - org.apache.activemq:activemq-server - org.apache.activemq:activemq-service-extensions - org.apache.activemq:activemq-tools - org.apache.activemq:activemq-web - org.apache.activemq.rest:activemq-rest + org.apache.activemq:artemis-bootstrap + org.apache.activemq:artemis-commons + org.apache.activemq:artemis-core-client + org.apache.activemq:artemis-dto + org.apache.activemq:artemis-jms-client + org.apache.activemq:artemis-jms-server + org.apache.activemq:artemis-journal + org.apache.activemq:artemis-native + org.apache.activemq:artemis-amqp-protocol + org.apache.activemq:artemis-openwire-protocol + org.apache.activemq:artemis-proton-plug + org.apache.activemq:artemis-stomp-protocol + org.apache.activemq:artemis-ra + org.apache.activemq:artemis-selector + org.apache.activemq:artemis-server + org.apache.activemq:artemis-service-extensions + org.apache.activemq:artemis-tools + org.apache.activemq:artemis-web + org.apache.activemq.rest:artemis-rest org.apache.geronimo.specs:geronimo-jms_2.0_spec org.jboss.logmanager:jboss-logmanager @@ -86,7 +86,7 @@ org.fusesource.hawtbuf:hawtbuf lib false @@ -94,7 +94,7 @@ - org.apache.activemq:activemq-native + org.apache.activemq:artemis-native bin true @@ -106,17 +106,17 @@ - org.apache.activemq:activemq-website + org.apache.activemq:artemis-website - org.apache.activemq:activemq-website:jar:javadoc + org.apache.activemq:artemis-website:jar:javadoc web true - org.apache.activemq:activemq-website:jar:javadoc + org.apache.activemq:artemis-website:jar:javadoc web/api true @@ -132,12 +132,12 @@ - ${activemq.basedir}/activemq-server/src/main/resources/schema/ + ${activemq.basedir}/artemis-server/src/main/resources/schema/ schema keep - ${activemq.basedir}/activemq-jms-server/src/main/resources/schema/ + ${activemq.basedir}/artemis-jms-server/src/main/resources/schema/ schema keep diff --git a/distribution/activemq/src/main/assembly/source-assembly.xml b/distribution/artemis/src/main/assembly/source-assembly.xml similarity index 100% rename from distribution/activemq/src/main/assembly/source-assembly.xml rename to distribution/artemis/src/main/assembly/source-assembly.xml diff --git a/distribution/activemq/src/main/resources/README.html b/distribution/artemis/src/main/resources/README.html similarity index 86% rename from distribution/activemq/src/main/resources/README.html rename to distribution/artemis/src/main/resources/README.html index f0c05035b6..1b7b1a9767 100644 --- a/distribution/activemq/src/main/resources/README.html +++ b/distribution/artemis/src/main/resources/README.html @@ -22,7 +22,7 @@ under the License. - Apache ActiveMQ README + Apache ActiveMQ Artemis README @@ -57,11 +57,11 @@ $ ./activemq stop

    Documentation

    -The broker comes shipped with an in depth user manual and a bunch of examples to help you get started. The manual is accessible from the broker website. Start the broker then navigate to the Apache ActiveMQ.

    +The broker comes shipped with an in depth user manual and a bunch of examples to help you get started. The manual is accessible from the broker website. Start the broker then navigate to the Apache ActiveMQ Artemis.

    The examples are shipped inside the distribution folder under "examples"

    -

    Release Notes - ActiveMQ 6.0.0

    +

    Release Notes - ActiveMQ Artemis 1.0.0

    -The ActiveMQ 6.0.0 release notes can be found in the Apache ActiveMQ project JIRA. +The ActiveMQ Artemis 1.0.0 release notes can be found in the Apache ActiveMQ Artemis project JIRA. diff --git a/distribution/activemq/src/main/resources/bin/activemq b/distribution/artemis/src/main/resources/bin/activemq similarity index 96% rename from distribution/activemq/src/main/resources/bin/activemq rename to distribution/artemis/src/main/resources/bin/activemq index 4b99fd6f88..ab76baca67 100755 --- a/distribution/activemq/src/main/resources/bin/activemq +++ b/distribution/artemis/src/main/resources/bin/activemq @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -46,7 +46,7 @@ fi # Set Defaults Properties JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M" -CLASSPATH="$ACTIVEMQ_HOME/lib/activemq-boot.jar" +CLASSPATH="$ACTIVEMQ_HOME/lib/artemis-boot.jar" # OS specific support. cygwin=false; @@ -105,4 +105,4 @@ exec "$JAVACMD" $JAVA_ARGS $ACTIVEMQ_CLUSTER_PROPS \ -Dactivemq.home="$ACTIVEMQ_HOME" \ -Djava.library.path="$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_INSTANCE/bin/lib/linux-x86_64" \ $DEBUG_ARGS \ - org.apache.activemq.boot.ActiveMQ $@ + org.apache.activemq.artemis.boot.ActiveMQ $@ diff --git a/distribution/activemq/src/main/resources/bin/activemq.cmd b/distribution/artemis/src/main/resources/bin/activemq.cmd similarity index 92% rename from distribution/activemq/src/main/resources/bin/activemq.cmd rename to distribution/artemis/src/main/resources/bin/activemq.cmd index 8ab6163c2e..344c9df4a9 100755 --- a/distribution/activemq/src/main/resources/bin/activemq.cmd +++ b/distribution/artemis/src/main/resources/bin/activemq.cmd @@ -6,9 +6,9 @@ rem regarding copyright ownership. The ASF licenses this file rem to you under the Apache License, Version 2.0 (the rem "License"); you may not use this file except in compliance rem with the License. You may obtain a copy of the License at -rem +rem rem http://www.apache.org/licenses/LICENSE-2.0 -rem +rem rem Unless required by applicable law or agreed to in writing, rem software distributed under the License is distributed on an rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -53,11 +53,11 @@ set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods rem "Create full JVM Args" set JVM_ARGS=%JAVA_ARGS% if not "%ACTIVEMQ_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ACTIVEMQ_CLUSTER_PROPS% -set JVM_ARGS=%JVM_ARGS% -classpath "%ACTIVEMQ_HOME%\lib\activemq-boot.jar" +set JVM_ARGS=%JVM_ARGS% -classpath "%ACTIVEMQ_HOME%\lib\artemis-boot.jar" set JVM_ARGS=%JVM_ARGS% -Dactivemq.home="%ACTIVEMQ_HOME%" if not "%DEBUG_ARGS%"=="" set JVM_ARGS=%JVM_ARGS% %DEBUG_ARGS% -"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.boot.ActiveMQ %* +"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.ActiveMQ %* :END endlocal diff --git a/distribution/activemq/src/main/resources/licenses/bin/LICENSE b/distribution/artemis/src/main/resources/licenses/bin/LICENSE similarity index 100% rename from distribution/activemq/src/main/resources/licenses/bin/LICENSE rename to distribution/artemis/src/main/resources/licenses/bin/LICENSE diff --git a/distribution/activemq/src/main/resources/licenses/bin/NOTICE b/distribution/artemis/src/main/resources/licenses/bin/NOTICE similarity index 86% rename from distribution/activemq/src/main/resources/licenses/bin/NOTICE rename to distribution/artemis/src/main/resources/licenses/bin/NOTICE index 6303fab9b2..28c29dc218 100644 --- a/distribution/activemq/src/main/resources/licenses/bin/NOTICE +++ b/distribution/artemis/src/main/resources/licenses/bin/NOTICE @@ -1,4 +1,4 @@ -Apache ActiveMQ +Apache ActiveMQ Artemis Copyright [2014-2015] The Apache Software Foundation This product includes software developed at diff --git a/distribution/pom.xml b/distribution/pom.xml index 7a959fc17e..721bd1efe4 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -23,11 +23,11 @@ under the License. org.apache.activemq - activemq-pom - 10.0.0-SNAPSHOT + artemis-pom + 1.0.0-SNAPSHOT - activemq-artemis-distribution + artemis-distribution pom ActiveMQ Artemis Distribution @@ -48,7 +48,7 @@ under the License.     - activemq + artemis diff --git a/docs/README.html b/docs/README.html index 95bed87a8b..def9391644 100644 --- a/docs/README.html +++ b/docs/README.html @@ -22,12 +22,12 @@ under the License. - Apache ActiveMQ Release Notes + Apache ActiveMQ Artemis Release Notes -

    Release Notes - Apache ActiveMQ 6.0.0

    +

    Release Notes - Apache ActiveMQ Artemis 1.0.0

    -The Apache ActiveMQ 6.0.0 release notes can be found in the Apache ActiveMQ project JIRA. +The Apache ActiveMQ Artemis 1.0.0 release notes can be found in the Apache ActiveMQ Artemis project JIRA. For more info on what this release has to offer please refer to the quick start guide or the user manual. Enjoy!! diff --git a/docs/quickstart-guide/en/running.md b/docs/quickstart-guide/en/running.md index a3b2ce5d3b..0a9a0d9bdd 100644 --- a/docs/quickstart-guide/en/running.md +++ b/docs/quickstart-guide/en/running.md @@ -40,7 +40,7 @@ to do start running the broker instance is execute: Now that the broker is running, you can optionally run some of the included examples to verify the the broker is running properly. -To stop the Apache ActiveMQ instance you will use the same `activemq` script, but with +To stop the Apache ActiveMQ Artemis instance you will use the same `activemq` script, but with the `stop argument`. Example: /var/lib/mybroker/bin/activemq stop diff --git a/docs/user-manual/en/README.md b/docs/user-manual/en/README.md index 1d35c43ec9..4ea32c8bb0 100644 --- a/docs/user-manual/en/README.md +++ b/docs/user-manual/en/README.md @@ -1,7 +1,7 @@ ![ActiveMQ logo](images/activemq-logo.jpg) -Apache ActiveMQ User Manual +Apache ActiveMQ Artemis User Manual ==================== -The User manual is an in depth manual on all aspects of Apache ActiveMQ +The User manual is an in depth manual on all aspects of Apache ActiveMQ Artemis diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index 9bd05b8416..48724fcdb8 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -13,7 +13,7 @@ * [The Client Classpath](client-classpath.md) * [Examples](examples.md) * [Routing Messages With Wild Cards](wildcard-routing.md) -* [Understanding the Apache ActiveMQ Wildcard Syntax](wildcard-syntax.md) +* [Understanding the Apache ActiveMQ Artemis Wildcard Syntax](wildcard-syntax.md) * [Filter Expressions](filter-expressions.md) * [Persistence](persistence.md) * [Configuring Transports](configuring-transports.md) @@ -45,7 +45,7 @@ * [Thread management](thread-pooling.md) * [Logging](logging.md) * [REST Interface](rest.md) -* [Embedding Apache ActiveMQ](embedding-activemq.md) +* [Embedding Apache ActiveMQ Artemis](embedding-activemq.md) * [Spring Integration](spring-integration.md) * [AeroGear Integration](aerogear-integration.md) * [VertX Integration](vertx-integration.md) diff --git a/docs/user-manual/en/aerogear-integration.md b/docs/user-manual/en/aerogear-integration.md index df1f3e0f07..2a83f4d7dc 100644 --- a/docs/user-manual/en/aerogear-integration.md +++ b/docs/user-manual/en/aerogear-integration.md @@ -2,7 +2,7 @@ AeroGears push technology provides support for different push notification technologies like Google Cloud Messaging, Apple's APNs or -Mozilla's SimplePush. Apache ActiveMQ allows you to configure a Connector +Mozilla's SimplePush. Apache ActiveMQ Artemis allows you to configure a Connector Service that will consume messages from a queue and forward them to an AeroGear push server and subsequently sent as notifications to mobile devices. @@ -13,7 +13,7 @@ AeroGear Connector services are configured in the connector-services configuration: - org.apache.activemq.integration.aerogear.AeroGearConnectorServiceFactory + org.apache.activemq.artemis.integration.aerogear.AeroGearConnectorServiceFactory diff --git a/docs/user-manual/en/architecture.md b/docs/user-manual/en/architecture.md index e1053a4cda..b20efec5e1 100644 --- a/docs/user-manual/en/architecture.md +++ b/docs/user-manual/en/architecture.md @@ -1,31 +1,31 @@ # Architecture -In this section we will give an overview of the Apache ActiveMQ high level +In this section we will give an overview of the Apache ActiveMQ Artemis high level architecture. ## Core Architecture -Apache ActiveMQ core is designed simply as set of Plain Old Java Objects +Apache ActiveMQ Artemis core is designed simply as set of Plain Old Java Objects (POJOs) - we hope you like its clean-cut design. We've also designed it to have as few dependencies on external jars as -possible. In fact, Apache ActiveMQ core has only one jar dependency, netty.jar, +possible. In fact, Apache ActiveMQ Artemis core has only one jar dependency, netty.jar, other than the standard JDK classes! This is because we use some of the netty buffer classes internally. -This allows Apache ActiveMQ to be easily embedded in your own project, or +This allows Apache ActiveMQ Artemis to be easily embedded in your own project, or instantiated in any dependency injection framework such as Spring or Google Guice. -Each Apache ActiveMQ server has its own ultra high performance persistent +Each Apache ActiveMQ Artemis server has its own ultra high performance persistent journal, which it uses for message and other persistence. Using a high performance journal allows outrageous persistence message performance, something not achievable when using a relational database for persistence. -Apache ActiveMQ clients, potentially on different physical machines interact -with the Apache ActiveMQ server. Apache ActiveMQ currently provides two APIs for +Apache ActiveMQ Artemis clients, potentially on different physical machines interact +with the Apache ActiveMQ Artemis server. Apache ActiveMQ Artemis currently provides two APIs for messaging at the client side: 1. Core client API. This is a simple intuitive Java API that allows the @@ -35,7 +35,7 @@ messaging at the client side: 2. JMS client API. The standard JMS API is available at the client side. -Apache ActiveMQ also provides different protocol implementations on the server so you can use respective clients for these protocols: +Apache ActiveMQ Artemis also provides different protocol implementations on the server so you can use respective clients for these protocols: 1. Stomp 2. OpenWire @@ -45,13 +45,13 @@ Apache ActiveMQ also provides different protocol implementations on the server s JMS semantics are implemented by a JMS facade layer on the client side. -The Apache ActiveMQ server does not speak JMS and in fact does not know +The Apache ActiveMQ Artemis server does not speak JMS and in fact does not know anything about JMS, it is a protocol agnostic messaging server designed to be used with multiple different protocols. When a user uses the JMS API on the client side, all JMS interactions -are translated into operations on the Apache ActiveMQ core client API before -being transferred over the wire using the Apache ActiveMQ wire format. +are translated into operations on the Apache ActiveMQ Artemis core client API before +being transferred over the wire using the Apache ActiveMQ Artemis wire format. The server always just deals with core API interactions. @@ -59,47 +59,47 @@ A schematic illustrating this relationship is shown in figure 3.1 below: ![ActiveMQ architecture1](images/architecture1.jpg) -Figure 3.1 shows two user applications interacting with an Apache ActiveMQ +Figure 3.1 shows two user applications interacting with an Apache ActiveMQ Artemis server. User Application 1 is using the JMS API, while User Application 2 is using the core client API directly. You can see from the diagram that the JMS API is implemented by a thin facade layer on the client side. -## Apache ActiveMQ embedded in your own application +## Apache ActiveMQ Artemis embedded in your own application -Apache ActiveMQ core is designed as a set of simple POJOs so if you have an +Apache ActiveMQ Artemis core is designed as a set of simple POJOs so if you have an application that requires messaging functionality internally but you -don't want to expose that as an Apache ActiveMQ server you can directly -instantiate and embed Apache ActiveMQ servers in your own application. +don't want to expose that as an Apache ActiveMQ Artemis server you can directly +instantiate and embed Apache ActiveMQ Artemis servers in your own application. -For more information on embedding Apache ActiveMQ, see [Embedding Apache ActiveMQ](embedding-Apache activemq.md). +For more information on embedding Apache ActiveMQ Artemis, see [Embedding Apache ActiveMQ Artemis](embedding-Apache ActiveMQ Artemis.md). -## Apache ActiveMQ integrated with a JEE application server +## Apache ActiveMQ Artemis integrated with a Java EE application server -Apache ActiveMQ provides its own fully functional Java Connector Architecture -(JCA) adaptor which enables it to be integrated easily into any JEE +Apache ActiveMQ Artemis provides its own fully functional Java Connector Architecture +(JCA) adaptor which enables it to be integrated easily into any Java EE compliant application server or servlet engine. -JEE application servers provide Message Driven Beans (MDBs), which are a +Java EE application servers provide Message Driven Beans (MDBs), which are a special type of Enterprise Java Beans (EJBs) that can process messages from sources such as JMS systems or mail systems. Probably the most common use of an MDB is to consume messages from a JMS messaging system. -According to the JEE specification, a JEE application server uses a JCA +According to the Java EE specification, a Java EE application server uses a JCA adapter to integrate with a JMS messaging system so it can consume messages for MDBs. -However, the JCA adapter is not only used by the JEE application server +However, the JCA adapter is not only used by the Java EE application server for *consuming* messages via MDBs, it is also used when sending message to the JMS messaging system e.g. from inside an EJB or servlet. -When integrating with a JMS messaging system from inside a JEE +When integrating with a JMS messaging system from inside a Java EE application server it is always recommended that this is done via a JCA adaptor. In fact, communicating with a JMS messaging system directly, -without using JCA would be illegal according to the JEE specification. +without using JCA would be illegal according to the Java EE specification. The application server's JCA service provides extra functionality such as connection pooling and automatic transaction enlistment, which are @@ -109,13 +109,13 @@ without going through a JCA adapter, but this is not recommended since you will not be able to take advantage of the JCA features, such as caching of JMS sessions, which can result in poor performance. -Figure 3.2 below shows a JEE application server integrating with a -Apache ActiveMQ server via the Apache ActiveMQ JCA adaptor. Note that all +Figure 3.2 below shows a Java EE application server integrating with a +Apache ActiveMQ Artemis server via the Apache ActiveMQ Artemis JCA adaptor. Note that all communication between EJB sessions or entity beans and Message Driven -beans go through the adaptor and not directly to Apache ActiveMQ. +beans go through the adaptor and not directly to Apache ActiveMQ Artemis. The large arrow with the prohibited sign shows an EJB session bean -talking directly to the Apache ActiveMQ server. This is not recommended as +talking directly to the Apache ActiveMQ Artemis server. This is not recommended as you'll most likely end up creating a new connection and session every time you want to interact from the EJB, which is an anti-pattern. @@ -123,10 +123,10 @@ time you want to interact from the EJB, which is an anti-pattern. For more information on using the JCA adaptor, please see [Application Server Integration and Java EE](appserver-integration.md). -## Apache ActiveMQ stand-alone server +## Apache ActiveMQ Artemis stand-alone server -Apache ActiveMQ can also be deployed as a stand-alone server. This means a -fully independent messaging server not dependent on a JEE application +Apache ActiveMQ Artemis can also be deployed as a stand-alone server. This means a +fully independent messaging server not dependent on a Java EE application server. The standard stand-alone messaging server configuration comprises a core diff --git a/docs/user-manual/en/client-classpath.md b/docs/user-manual/en/client-classpath.md index 748fe0c80f..931ad4acba 100644 --- a/docs/user-manual/en/client-classpath.md +++ b/docs/user-manual/en/client-classpath.md @@ -1,19 +1,19 @@ # The Client Classpath -Apache ActiveMQ requires several jars on the *Client Classpath* depending on -whether the client uses Apache ActiveMQ Core API, JMS, and JNDI. +Apache ActiveMQ Artemis requires several jars on the *Client Classpath* depending on +whether the client uses Apache ActiveMQ Artemis Core API, JMS, and JNDI. > **Warning** > > All the jars mentioned here can be found in the `lib` directory of the -> Apache ActiveMQ distribution. Be sure you only use the jars from the correct +> Apache ActiveMQ Artemis distribution. Be sure you only use the jars from the correct > version of the release, you *must not* mix and match versions of jars -> from different Apache ActiveMQ versions. Mixing and matching different jar +> from different Apache ActiveMQ Artemis versions. Mixing and matching different jar > versions may cause subtle errors and failures to occur. -## Apache ActiveMQ Core Client +## Apache ActiveMQ Artemis Core Client -If you are using just a pure Apache ActiveMQ Core client (i.e. no JMS) then you +If you are using just a pure Apache ActiveMQ Artemis Core client (i.e. no JMS) then you need `activemq-core-client.jar`, `activemq-commons.jar`, and `netty.jar` on your client classpath. diff --git a/docs/user-manual/en/client-reconnection.md b/docs/user-manual/en/client-reconnection.md index 661d9875ff..5cd7fb0eed 100644 --- a/docs/user-manual/en/client-reconnection.md +++ b/docs/user-manual/en/client-reconnection.md @@ -1,6 +1,6 @@ # Client Reconnection and Session Reattachment -Apache ActiveMQ clients can be configured to automatically reconnect or +Apache ActiveMQ Artemis clients can be configured to automatically reconnect or re-attach to the server in the event that a failure is detected in the connection between the client and the server. @@ -11,14 +11,14 @@ network failure, and the target server was not restarted, then the sessions will still be existent on the server, assuming the client hasn't been disconnected for more than connection-ttl [Detecting Dead Connections](connection-ttl.md) -In this scenario, Apache ActiveMQ will automatically re-attach the client +In this scenario, Apache ActiveMQ Artemis will automatically re-attach the client sessions to the server sessions when the connection reconnects. This is done 100% transparently and the client can continue exactly as if nothing had happened. The way this works is as follows: -As Apache ActiveMQ clients send commands to their servers they store each sent +As Apache ActiveMQ Artemis clients send commands to their servers they store each sent command in an in-memory buffer. In the case that connection failure occurs and the client subsequently reattaches to the same server, as part of the reattachment protocol the server informs the client during @@ -59,7 +59,7 @@ crashing or being stopped. In this case any sessions will no longer be existent on the server and it won't be possible to 100% transparently re-attach to them. -In this case, Apache ActiveMQ will automatically reconnect the connection and +In this case, Apache ActiveMQ Artemis will automatically reconnect the connection and *recreate* any sessions and consumers on the server corresponding to the sessions and consumers on the client. This process is exactly the same as what happens during failover onto a backup server. @@ -114,7 +114,7 @@ If you're using JMS and you're using JNDI on the client to look up your JMS connection factory instances then you can specify these parameters in the JNDI context environment in, e.g. `jndi.properties`: - java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial = ActiveMQInitialContextFactory connection.ConnectionFactory=tcp://localhost:61616?retryInterval=1000&retryIntervalMultiplier=1.5&maxRetryInterval=60000&reconnectAttempts=1000 If you're using JMS, but instantiating your JMS connection factory diff --git a/docs/user-manual/en/clusters.md b/docs/user-manual/en/clusters.md index baf96905d0..d9a128c2ea 100644 --- a/docs/user-manual/en/clusters.md +++ b/docs/user-manual/en/clusters.md @@ -2,9 +2,9 @@ ## Clusters Overview -Apache ActiveMQ clusters allow groups of Apache ActiveMQ servers to be grouped +Apache ActiveMQ Artemis clusters allow groups of Apache ActiveMQ Artemis servers to be grouped together in order to share message processing load. Each active node in -the cluster is an active Apache ActiveMQ server which manages its own messages +the cluster is an active Apache ActiveMQ Artemis server which manages its own messages and handles its own connections. The cluster is formed by each node declaring *cluster connections* to @@ -22,7 +22,7 @@ in this chapter. We'll also discuss client side load balancing, where we can balance client connections across the nodes of the cluster, and we'll consider -message redistribution where Apache ActiveMQ will redistribute messages between +message redistribution where Apache ActiveMQ Artemis will redistribute messages between nodes to avoid starvation. Another important part of clustering is *server discovery* where servers @@ -33,8 +33,8 @@ connect to them with the minimum of configuration. > > Once a cluster node has been configured it is common to simply copy > that configuration to other nodes to produce a symmetric cluster. -> However, care must be taken when copying the Apache ActiveMQ files. Do not -> copy the Apache ActiveMQ *data* (i.e. the `bindings`, `journal`, and +> However, care must be taken when copying the Apache ActiveMQ Artemis files. Do not +> copy the Apache ActiveMQ Artemis *data* (i.e. the `bindings`, `journal`, and > `large-messages` directories) from one node to another. When a node is > started for the first time and initializes its journal files it also > persists a special identifier to the `journal` directory. This id @@ -55,7 +55,7 @@ connection details to: all the other servers in the cluster. This information, let's call it the Cluster Topology, is actually sent -around normal Apache ActiveMQ connections to clients and to other servers over +around normal Apache ActiveMQ Artemis connections to clients and to other servers over cluster connections. This being the case we need a way of establishing the initial first connection. This can be done using dynamic discovery techniques like @@ -85,7 +85,7 @@ JGroups to broadcast connector pairs information. Broadcast groups are defined in the server configuration file `activemq-configuration.xml`. There can be many broadcast groups per -Apache ActiveMQ server. All broadcast groups must be defined in a +Apache ActiveMQ Artemis server. All broadcast groups must be defined in a `broadcast-groups` element. Let's take a look at an example broadcast group from @@ -159,7 +159,7 @@ following: - `jgroups-file` attribute. This is the name of JGroups configuration file. It will be used to initialize JGroups channels. Make sure the - file is in the java resource path so that Apache ActiveMQ can load it. + file is in the java resource path so that Apache ActiveMQ Artemis can load it. - `jgroups-channel` attribute. The name that JGroups channels connect to for broadcasting. @@ -226,7 +226,7 @@ The following is an example of a JGroups file As it shows, the file content defines a jgroups protocol stacks. If you -want Apache activemq to use this stacks for channel creation, you have to make +want Apache ActiveMQ Artemis to use this stacks for channel creation, you have to make sure the value of `jgroups-file` in your broadcast-group/discovery-group configuration to be the name of this jgroups configuration file. For example if the above stacks configuration is stored in a file named @@ -249,7 +249,7 @@ list for that server. If it has not received a broadcast from a particular server for a length of time it will remove that server's entry from its list. -Discovery groups are used in two places in Apache ActiveMQ: +Discovery groups are used in two places in Apache ActiveMQ Artemis: - By cluster connections so they know how to obtain an initial connection to download the topology @@ -260,7 +260,7 @@ Discovery groups are used in two places in Apache ActiveMQ: Although a discovery group will always accept broadcasts, its current list of available live and backup servers is only ever used when an initial connection is made, from then server discovery is done over the -normal Apache ActiveMQ connections. +normal Apache ActiveMQ Artemis connections. > **Note** > @@ -274,7 +274,7 @@ normal Apache ActiveMQ connections. For cluster connections, discovery groups are defined in the server side configuration file `activemq-configuration.xml`. All discovery groups must be defined inside a `discovery-groups` element. There can be many -discovery groups defined by Apache ActiveMQ server. Let's look at an example: +discovery groups defined by Apache ActiveMQ Artemis server. Let's look at an example: @@ -331,7 +331,7 @@ details as following: - `jgroups-file` attribute. This is the name of JGroups configuration file. It will be used to initialize JGroups channels. Make sure the - file is in the java resource path so that Apache ActiveMQ can load it. + file is in the java resource path so that Apache ActiveMQ Artemis can load it. - `jgroups-channel` attribute. The name that JGroups channels connect to for receiving broadcasts. @@ -345,7 +345,7 @@ details as following: #### Discovery Groups on the Client Side -Let's discuss how to configure an Apache ActiveMQ client to use discovery to +Let's discuss how to configure an Apache ActiveMQ Artemis client to use discovery to discover a list of servers to which it can connect. The way to do this differs depending on whether you're using JMS or the core API. @@ -358,7 +358,7 @@ ensure the host:port combination matches the group-address and group-port from the corresponding `broadcast-group` on the server. Let's take a look at an example: - java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial = ActiveMQInitialContextFactory connectionFactory.myConnectionFactory=udp://231.7.7.7:9876 The element `discovery-group-ref` specifies the name of a discovery @@ -462,7 +462,7 @@ If you're using JMS and you're using JNDI on the client to look up your JMS connection factory instances then you can specify these parameters in the JNDI context environment in, e.g. `jndi.properties`: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.myConnectionFactory=(tcp://myhost:61616,tcp://myhost2:61616) The `connectionFactory.myConnectionFactory` contains a list of servers to use for the @@ -511,7 +511,7 @@ ClientSession session = factory.createSession(); ## Server-Side Message Load Balancing If cluster connections are defined between nodes of a cluster, then -Apache ActiveMQ will load balance messages arriving at a particular node from a +Apache ActiveMQ Artemis will load balance messages arriving at a particular node from a client. Let's take a simple example of a cluster of four nodes A, B, C, and D @@ -537,7 +537,7 @@ following order between the nodes: B, D, C, A, B, D, C, A, B, D. The exact order depends on the order the nodes started up, but the algorithm used is round robin. -Apache ActiveMQ cluster connections can be configured to always blindly load +Apache ActiveMQ Artemis cluster connections can be configured to always blindly load balance messages in a round robin fashion irrespective of whether there are any matching consumers on other nodes, but they can be a bit cleverer than that and also be configured to only distribute to other @@ -551,7 +551,7 @@ Cluster connections group servers into clusters so that messages can be load balanced between the nodes of the cluster. Let's take a look at a typical cluster connection. Cluster connections are always defined in `activemq-configuration.xml` inside a `cluster-connection` element. -There can be zero or more cluster connections defined per Apache ActiveMQ +There can be zero or more cluster connections defined per Apache ActiveMQ Artemis server. @@ -598,7 +598,7 @@ specified. The following shows all the available configuration options connections with different values of `address`, simultaneously balancing messages for those addresses, potentially to different clusters of servers. By having multiple cluster connections on - different addresses a single Apache ActiveMQ Server can effectively take + different addresses a single Apache ActiveMQ Artemis Server can effectively take part in multiple clusters simultaneously. Be careful not to have multiple cluster connections with overlapping @@ -704,11 +704,11 @@ specified. The following shows all the available configuration options robin'd even though the same queues on the other nodes of the cluster may have no consumers at all, or they may have consumers that have non matching message filters (selectors). Note that - Apache ActiveMQ will *not* forward messages to other nodes if there are no + Apache ActiveMQ Artemis will *not* forward messages to other nodes if there are no *queues* of the same name on the other nodes, even if this parameter is set to `true`. - If this is set to `false` then Apache ActiveMQ will only forward messages + If this is set to `false` then Apache ActiveMQ Artemis will only forward messages to other nodes of the cluster if the address to which they are being forwarded has queues which have consumers, and if those consumers have message filters (selectors) at least one of those selectors @@ -718,17 +718,17 @@ specified. The following shows all the available configuration options - `max-hops`. When a cluster connection decides the set of nodes to which it might load balance a message, those nodes do not have to be - directly connected to it via a cluster connection. Apache ActiveMQ can be + directly connected to it via a cluster connection. Apache ActiveMQ Artemis can be configured to also load balance messages to nodes which might be - connected to it only indirectly with other Apache ActiveMQ servers as + connected to it only indirectly with other Apache ActiveMQ Artemis servers as intermediates in a chain. - This allows Apache ActiveMQ to be configured in more complex topologies and + This allows Apache ActiveMQ Artemis to be configured in more complex topologies and still provide message load balancing. We'll discuss this more later in this chapter. The default value for this parameter is `1`, which means messages - are only load balanced to other Apache ActiveMQ serves which are directly + are only load balanced to other Apache ActiveMQ Artemis serves which are directly connected to this server. This parameter is optional. - `confirmation-window-size`. The size (in bytes) of the window used @@ -774,7 +774,7 @@ connection has been made. ### Cluster User Credentials When creating connections between nodes of a cluster to form a cluster -connection, Apache ActiveMQ uses a cluster user and cluster password which is +connection, Apache ActiveMQ Artemis uses a cluster user and cluster password which is defined in `activemq-configuration.xml`: ACTIVEMQ.CLUSTER.ADMIN.USER @@ -784,18 +784,18 @@ defined in `activemq-configuration.xml`: > > It is imperative that these values are changed from their default, or > remote clients will be able to make connections to the server using -> the default values. If they are not changed from the default, Apache ActiveMQ +> the default values. If they are not changed from the default, Apache ActiveMQ Artemis > will detect this and pester you with a warning on every start-up. ## Client-Side Load balancing -With Apache ActiveMQ client-side load balancing, subsequent sessions created +With Apache ActiveMQ Artemis client-side load balancing, subsequent sessions created using a single session factory can be connected to different nodes of the cluster. This allows sessions to spread smoothly across the nodes of a cluster and not be "clumped" on any particular node. The load balancing policy to be used by the client factory is -configurable. Apache ActiveMQ provides four out-of-the-box load balancing +configurable. Apache ActiveMQ Artemis provides four out-of-the-box load balancing policies, and you can also implement your own and use that. The out-of-the-box policies are @@ -843,7 +843,7 @@ JMS connection factory instances then you can specify these parameters in the JNDI context environment in, e.g. `jndi.properties`, to specify the load balancing policy directly: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connection.myConnectionFactory=tcp://localhost:61616?loadBalancingPolicyClassName=org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy The above example would instantiate a JMS connection factory that uses @@ -912,7 +912,7 @@ consumers on the queue the message won't get consumed and we have a *starvation* situation. This is where message redistribution comes in. With message -redistribution Apache ActiveMQ can be configured to automatically +redistribution Apache ActiveMQ Artemis can be configured to automatically *redistribute* messages from queues which have no consumers back to other nodes in the cluster which do have matching consumers. @@ -941,7 +941,7 @@ with "jms.", so the above would enable instant (no delay) redistribution for all JMS queues and topic subscriptions. The attribute `match` can be an exact match or it can be a string that -conforms to the Apache ActiveMQ wildcard syntax (described in [Wildcard Syntax](wildcard-syntax.md)). +conforms to the Apache ActiveMQ Artemis wildcard syntax (described in [Wildcard Syntax](wildcard-syntax.md)). The element `redistribution-delay` defines the delay in milliseconds after the last consumer is closed on a queue before redistributing @@ -957,7 +957,7 @@ redistribute immediately since the new consumer will arrive shortly. ## Cluster topologies -Apache ActiveMQ clusters can be connected together in many different +Apache ActiveMQ Artemis clusters can be connected together in many different topologies, let's consider the two most common ones here ### Symmetric cluster @@ -1016,13 +1016,13 @@ which does have consumers. ### Scaling Down -Apache ActiveMQ supports scaling down a cluster with no message loss (even for +Apache ActiveMQ Artemis supports scaling down a cluster with no message loss (even for non-durable messages). This is especially useful in certain environments (e.g. the cloud) where the size of a cluster may change relatively frequently. When scaling up a cluster (i.e. adding nodes) there is no risk of message loss, but when scaling down a cluster (i.e. removing nodes) the messages on those nodes would be lost unless the broker sent -them to another node in the cluster. Apache ActiveMQ can be configured to do +them to another node in the cluster. Apache ActiveMQ Artemis can be configured to do just that. The simplest way to enable this behavior is to set `scale-down` to diff --git a/docs/user-manual/en/configuration-index.md b/docs/user-manual/en/configuration-index.md index 994c402d44..21b8fe6463 100644 --- a/docs/user-manual/en/configuration-index.md +++ b/docs/user-manual/en/configuration-index.md @@ -235,21 +235,21 @@ Name | Type | Description Using Masked Passwords in Configuration Files --------------------------------------------- -By default all passwords in Apache ActiveMQ server's configuration files are in +By default all passwords in Apache ActiveMQ Artemis server's configuration files are in plain text form. This usually poses no security issues as those files should be well protected from unauthorized accessing. However, in some circumstances a user doesn't want to expose its passwords to more eyes than necessary. -Apache ActiveMQ can be configured to use 'masked' passwords in its +Apache ActiveMQ Artemis can be configured to use 'masked' passwords in its configuration files. A masked password is an obscure string representation of a real password. To mask a password a user will use an 'encoder'. The encoder takes in the real password and outputs the masked version. A user can then replace the real password in the configuration -files with the new masked password. When Apache ActiveMQ loads a masked +files with the new masked password. When Apache ActiveMQ Artemis loads a masked password, it uses a suitable 'decoder' to decode it into real password. -Apache ActiveMQ provides a default password encoder and decoder. Optionally +Apache ActiveMQ Artemis provides a default password encoder and decoder. Optionally users can use or implement their own encoder and decoder for masking the passwords. @@ -280,7 +280,7 @@ trust-store-password. Because Acceptors and Connectors are pluggable implementations, each transport will have different password masking needs. -When a Connector or Acceptor configuration is initialised, Apache ActiveMQ will +When a Connector or Acceptor configuration is initialised, Apache ActiveMQ Artemis will add the "mask-password" and "password-codec" values to the Connector or Acceptors params using the keys `activemq.usemaskedpassword` and `activemq.passwordcodec` respectively. The Netty and InVM @@ -324,7 +324,7 @@ example 2 80cf731af62c290 ``` -This indicates the cluster password is a masked value and Apache ActiveMQ will +This indicates the cluster password is a masked value and Apache ActiveMQ Artemis will use its built-in decoder to decode it. All other passwords in the configuration file, Connectors, Acceptors and Bridges, will also use masked passwords. @@ -350,7 +350,7 @@ followed by key/value pairs, separated by semi-colons. For example: com.foo.FooDecoder;key=value ``` -Apache ActiveMQ will load this property and initialize the class with a +Apache ActiveMQ Artemis will load this property and initialize the class with a parameter map containing the "key"-\>"value" pair. If `passwordCodec` is not specified, the built-in decoder is used. @@ -387,7 +387,7 @@ will have to be in masked form. ### Masking passwords in activemq-users.properties -Apache ActiveMQ's built-in security manager uses plain properties files +Apache ActiveMQ Artemis's built-in security manager uses plain properties files where the user passwords are specified in plaintext forms by default. To mask those parameters the following two properties need to be set in the 'bootstrap.xml' file. @@ -403,10 +403,10 @@ Bridges. Example: ```xml true -org.apache.activemq.utils.DefaultSensitiveStringCodec;key=hello world +org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec;key=hello world ``` -When so configured, the Apache ActiveMQ security manager will initialize a +When so configured, the Apache ActiveMQ Artemis security manager will initialize a DefaultSensitiveStringCodec with the parameters "key"-\>"hello world", then use it to decode all the masked passwords in this configuration file. @@ -419,23 +419,23 @@ its original clear text form in order to be used in various security operations. The algorithm used for decoding must match that for encoding. Otherwise the decoding may not be successful. -For user's convenience Apache ActiveMQ provides a default built-in Decoder. +For user's convenience Apache ActiveMQ Artemis provides a default built-in Decoder. However a user can if they so wish implement their own. #### The built-in Decoder Whenever no decoder is specified in the configuration file, the built-in decoder is used. The class name for the built-in decoder is -org.apache.activemq.utils.DefaultSensitiveStringCodec. It has both +org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec. It has both encoding and decoding capabilities. It uses java.crypto.Cipher utilities to encrypt (encode) a plaintext password and decrypt a mask string using same algorithm. Using this decoder/encoder is pretty straightforward. To -get a mask for a password, just run the main class at org.apache.activemq.utils.DefaultSensitiveStringCodec. +get a mask for a password, just run the main class at org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec. An easy way to do it is through activemq-tools--jar-with-dependencies.jar since it has all the dependencies: ```sh - java -cp activemq-tools-6.0.0-jar-with-dependencies.jar org.apache.activemq.utils.DefaultSensitiveStringCodec "your plaintext password" + java -cp activemq-tools-6.0.0-jar-with-dependencies.jar org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec "your plaintext password" ``` If you don't want to use the jar-with-dependencies, make sure the classpath is correct. You'll get something like @@ -449,7 +449,7 @@ Just copy "80cf731af62c290" and replace your plaintext password with it. #### Using a different decoder It is possible to use a different decoder rather than the built-in one. -Simply make sure the decoder is in Apache ActiveMQ's classpath and configure +Simply make sure the decoder is in Apache ActiveMQ Artemis's classpath and configure the server to use it as follows: ```xml @@ -471,7 +471,7 @@ Then configure your cluster-password like this: masked_password ``` -When Apache ActiveMQ reads the cluster-password it will initialize the +When Apache ActiveMQ Artemis reads the cluster-password it will initialize the NewDecoder and use it to decode "mask\_password". It also process all passwords using the new defined decoder. @@ -511,4 +511,4 @@ public class MyNewDecoder implements SensitiveDataCodec ``` Last but not least, once you get your own decoder, please add it to the -classpath. Otherwise Apache ActiveMQ will fail to load it! +classpath. Otherwise Apache ActiveMQ Artemis will fail to load it! diff --git a/docs/user-manual/en/configuring-transports.md b/docs/user-manual/en/configuring-transports.md index 26c607e5c3..b85e4fe3cf 100644 --- a/docs/user-manual/en/configuring-transports.md +++ b/docs/user-manual/en/configuring-transports.md @@ -1,11 +1,11 @@ # Configuring the Transport In this chapter we'll describe the concepts required for understanding -Apache ActiveMQ transports and where and how they're configured. +Apache ActiveMQ Artemis transports and where and how they're configured. ## Understanding Acceptors -One of the most important concepts in Apache ActiveMQ transports is the +One of the most important concepts in Apache ActiveMQ Artemis transports is the *acceptor*. Let's dive straight in and take a look at an acceptor defined in xml in the configuration file `activemq-configuration.xml`. @@ -18,7 +18,7 @@ one or more acceptors defined in the `acceptors` element. There's no upper limit to the number of acceptors per server. Each acceptor defines a way in which connections can be made to the -Apache ActiveMQ server. +Apache ActiveMQ Artemis server. In the above example we're defining an acceptor that uses [Netty](http://netty.io/) to listen for connections at port @@ -73,11 +73,11 @@ couple of reasons for this: That's defined by the `java.naming.provider.url` element in the JNDI context environment, e.g. `jndi.properties`. Behind the scenes, the - `org.apache.activemq.jndi.ActiveMQInitialContextFactory` uses the + `ActiveMQInitialContextFactory` uses the `java.naming.provider.url` to construct the transport. Here's a simple example: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.MyConnectionFactory=tcp://myhost:61616 ## Configuring the transport directly from the client side. @@ -99,12 +99,12 @@ uses the standard Netty TCP transport and will try and connect on port ``` java Map connectionParams = new HashMap(); -connectionParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, +connectionParams.put(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 61617); TransportConfiguration transportConfiguration = new TransportConfiguration( - "org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory", + "org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory", connectionParams); ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(transportConfiguration); @@ -123,11 +123,11 @@ on the server side or define a connection factory in `activemq-jms.xml`: ``` java Map connectionParams = new HashMap(); -connectionParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 61617); +connectionParams.put(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 61617); TransportConfiguration transportConfiguration = new TransportConfiguration( - "org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory", + "org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory", connectionParams); ConnectionFactory connectionFactory = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, transportConfiguration); @@ -139,7 +139,7 @@ etc ## Configuring the Netty transport -Out of the box, Apache ActiveMQ currently uses +Out of the box, Apache ActiveMQ Artemis currently uses [Netty](http://netty.io/), a high performance low level network library. @@ -151,9 +151,9 @@ We believe this caters for the vast majority of transport requirements. ## Single Port Support -Apache ActiveMQ supports using a single port for all -protocols, Apache ActiveMQ will automatically detect which protocol is being -used CORE, AMQP, STOMP or OPENWIRE and use the appropriate Apache ActiveMQ +Apache ActiveMQ Artemis supports using a single port for all +protocols, Apache ActiveMQ Artemis will automatically detect which protocol is being +used CORE, AMQP, STOMP or OPENWIRE and use the appropriate Apache ActiveMQ Artemis handler. It will also detect whether protocols such as HTTP or Web Sockets are being used and also use the appropriate decoders @@ -181,7 +181,7 @@ client. This works well with firewall policies that typically only allow connections to be initiated in one direction. All the valid Netty transport keys are defined in the class -`org.apache.activemq.core.remoting.impl.netty.TransportConstants`. Most +`org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants`. Most parameters can be used either with acceptors or connectors, some only work with acceptors. The following parameters can be used to configure Netty for simple TCP: @@ -242,7 +242,7 @@ Netty for simple TCP: TCP receive buffer in bytes. The default value for this property is `32768` bytes (32KiB). -- `batchDelay`. Before writing packets to the transport, Apache ActiveMQ can +- `batchDelay`. Before writing packets to the transport, Apache ActiveMQ Artemis can be configured to batch up writes for a maximum of `batchDelay` milliseconds. This can increase overall throughput for very small messages. It does so at the expense of an increase in average @@ -261,7 +261,7 @@ Netty for simple TCP: throughput set `directDeliver` to `false `. -- `nioRemotingThreads`. When configured to use NIO, Apache ActiveMQ will, +- `nioRemotingThreads`. When configured to use NIO, Apache ActiveMQ Artemis will, by default, use a number of threads equal to three times the number of cores (or hyper-threads) as reported by `Runtime.getRuntime().availableProcessors()` for processing incoming @@ -399,7 +399,7 @@ Netty HTTP uses the same properties as Netty TCP but adds the following additional properties: - `httpEnabled`. This is now no longer needed as of version 2.4. With - single port support Apache ActiveMQ will now automatically detect if http + single port support Apache ActiveMQ Artemis will now automatically detect if http is being used and configure itself. - `httpClientIdleTime`. How long a client can be idle before diff --git a/docs/user-manual/en/connection-ttl.md b/docs/user-manual/en/connection-ttl.md index ae26341d67..cd3c301454 100644 --- a/docs/user-manual/en/connection-ttl.md +++ b/docs/user-manual/en/connection-ttl.md @@ -1,12 +1,12 @@ # Detecting Dead Connections In this section we will discuss connection time-to-live (TTL) and -explain how Apache ActiveMQ deals with crashed clients and clients which have +explain how Apache ActiveMQ Artemis deals with crashed clients and clients which have exited without cleanly closing their resources. ## Cleaning up Dead Connection Resources on the Server -Before an Apache ActiveMQ client application exits it is considered good +Before an Apache ActiveMQ Artemis client application exits it is considered good practice that it should close its resources in a controlled manner, using a `finally` block. @@ -81,12 +81,12 @@ running out of memory or other resources. We have to balance the requirement for cleaning up dead client resources with the fact that sometimes the network between the client and the server can fail and then come back, allowing the client to reconnect. -Apache ActiveMQ supports client reconnection, so we don't want to clean up +Apache ActiveMQ Artemis supports client reconnection, so we don't want to clean up "dead" server side resources too soon or this will prevent any client from reconnecting, as it won't be able to find its old sessions on the server. -Apache ActiveMQ makes all of this configurable. For each `ClientSessionFactory` +Apache ActiveMQ Artemis makes all of this configurable. For each `ClientSessionFactory` we define a *connection TTL*. Basically, the TTL determines how long the server will keep a connection alive in the absence of any data arriving from the client. The client will automatically send "ping" packets @@ -120,19 +120,19 @@ As previously discussed, it's important that all core client sessions and JMS connections are always closed explicitly in a `finally` block when you are finished using them. -If you fail to do so, Apache ActiveMQ will detect this at garbage collection +If you fail to do so, Apache ActiveMQ Artemis will detect this at garbage collection time, and log a warning similar to the following in the logs (If you are using JMS the warning will involve a JMS connection not a client session): - [Finalizer] 20:14:43,244 WARNING [org.apache.activemq.core.client.impl.DelegatingSession] I'm closing a ClientSession you left open. Please make sure you close all ClientSessions explicitly before let + [Finalizer] 20:14:43,244 WARNING [org.apache.activemq.artemis.core.client.impl.DelegatingSession] I'm closing a ClientSession you left open. Please make sure you close all ClientSessions explicitly before let ting them go out of scope! - [Finalizer] 20:14:43,244 WARNING [org.apache.activemq.core.client.impl.DelegatingSession] The session you didn't close was created here: + [Finalizer] 20:14:43,244 WARNING [org.apache.activemq.artemis.core.client.impl.DelegatingSession] The session you didn't close was created here: java.lang.Exception - at org.apache.activemq.core.client.impl.DelegatingSession.(DelegatingSession.java:83) + at org.apache.activemq.artemis.core.client.impl.DelegatingSession.(DelegatingSession.java:83) at org.acme.yourproject.YourClass (YourClass.java:666) -Apache ActiveMQ will then close the connection / client session for you. +Apache ActiveMQ Artemis will then close the connection / client session for you. Note that the log will also tell you the exact line of your user code where you created the JMS connection / client session that you later did @@ -177,17 +177,17 @@ from a thread pool so that the remoting thread is not tied up for too long. Please note that processing operations asynchronously on another thread adds a little more latency. These packets are: -- `org.apache.activemq.core.protocol.core.impl.wireformat.RollbackMessage` +- `org.apache.activemq.artemis.core.protocol.core.impl.wireformat.RollbackMessage` -- `org.apache.activemq.core.protocol.core.impl.wireformat.SessionCloseMessage` +- `org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionCloseMessage` -- `org.apache.activemq.core.protocol.core.impl.wireformat.SessionCommitMessage` +- `org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionCommitMessage` -- `org.apache.activemq.core.protocol.core.impl.wireformat.SessionXACommitMessage` +- `org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXACommitMessage` -- `org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAPrepareMessage` +- `org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAPrepareMessage` -- `org.apache.activemq.core.protocol.core.impl.wireformat.SessionXARollbackMessage` +- `org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXARollbackMessage` To disable asynchronous connection execution, set the parameter `async-connection-execution-enabled` in `activemq-configuration.xml` to diff --git a/docs/user-manual/en/core-bridges.md b/docs/user-manual/en/core-bridges.md index 3bf4f9d3aa..d4b5b5e8b4 100644 --- a/docs/user-manual/en/core-bridges.md +++ b/docs/user-manual/en/core-bridges.md @@ -1,7 +1,7 @@ # Core Bridges The function of a bridge is to consume messages from a source queue, and -forward them to a target address, typically on a different Apache ActiveMQ +forward them to a target address, typically on a different Apache ActiveMQ Artemis server. The source and target servers do not have to be in the same cluster @@ -14,9 +14,9 @@ connection is lost, e.g. due to network failure, the bridge will retry connecting to the target until it comes back online. When it comes back online it will resume operation as normal. -In summary, bridges are a way to reliably connect two separate Apache ActiveMQ +In summary, bridges are a way to reliably connect two separate Apache ActiveMQ Artemis servers together. With a core bridge both source and target servers must -be Apache ActiveMQ servers. +be Apache ActiveMQ Artemis servers. Bridges can be configured to provide *once and only once* delivery guarantees even in the event of the failure of the source or the target @@ -27,7 +27,7 @@ server. They do this by using duplicate detection (described in [Duplicate Detec > Although they have similar function, don't confuse core bridges with > JMS bridges! > -> Core bridges are for linking an Apache ActiveMQ node with another Apache ActiveMQ +> Core bridges are for linking an Apache ActiveMQ Artemis node with another Apache ActiveMQ Artemis > node and do not use the JMS API. A JMS Bridge is used for linking any > two JMS 1.1 compliant JMS providers. So, a JMS Bridge could be used > for bridging to or from different JMS compliant messaging system. It's @@ -102,7 +102,7 @@ Let's take a look at all the parameters in turn: - `transformer-class-name`. An optional transformer-class-name can be specified. This is the name of a user-defined class which implements - the `org.apache.activemq.core.server.cluster.Transformer` interface. + the `org.apache.activemq.artemis.core.server.cluster.Transformer` interface. If this is specified then the transformer's `transform()` method will be invoked with the message before it is forwarded. This gives diff --git a/docs/user-manual/en/diagrams/architecture-diagrams.odg b/docs/user-manual/en/diagrams/architecture-diagrams.odg index e73560be77..5fc7da6b04 100644 Binary files a/docs/user-manual/en/diagrams/architecture-diagrams.odg and b/docs/user-manual/en/diagrams/architecture-diagrams.odg differ diff --git a/docs/user-manual/en/diverts.md b/docs/user-manual/en/diverts.md index 3876a22e4a..c54b9b19a2 100644 --- a/docs/user-manual/en/diverts.md +++ b/docs/user-manual/en/diverts.md @@ -1,6 +1,6 @@ # Diverting and Splitting Message Flows -Apache ActiveMQ allows you to configure objects called *diverts* with some +Apache ActiveMQ Artemis allows you to configure objects called *diverts* with some simple server configuration. Diverts allow you to transparently divert messages routed to one address diff --git a/docs/user-manual/en/duplicate-detection.md b/docs/user-manual/en/duplicate-detection.md index e02fcafcf9..6d9efe49b4 100644 --- a/docs/user-manual/en/duplicate-detection.md +++ b/docs/user-manual/en/duplicate-detection.md @@ -1,9 +1,9 @@ # Duplicate Message Detection -Apache ActiveMQ includes powerful automatic duplicate message detection, +Apache ActiveMQ Artemis includes powerful automatic duplicate message detection, filtering out duplicate messages without you having to code your own fiddly duplicate detection logic at the application level. This chapter -will explain what duplicate detection is, how Apache ActiveMQ uses it and how +will explain what duplicate detection is, how Apache ActiveMQ Artemis uses it and how and where to configure it. When sending messages from a client to a server, or indeed from a server @@ -34,7 +34,7 @@ server or connection fails while the transaction commit is being processed it is also indeterminate whether the transaction was successfully committed or not! -To solve these issues Apache ActiveMQ provides automatic duplicate messages +To solve these issues Apache ActiveMQ Artemis provides automatic duplicate messages detection for messages sent to addresses. ## Using Duplicate Detection for Message Sending @@ -101,7 +101,7 @@ message.setStringProperty(HDR_DUPLICATE_DETECTION_ID.toString(), myUniqueID); ## Configuring the Duplicate ID Cache The server maintains caches of received values of the -`org.apache.activemq.core.message.impl.HDR_DUPLICATE_DETECTION_ID` +`org.apache.activemq.artemis.core.message.impl.HDR_DUPLICATE_DETECTION_ID` property sent to each address. Each address has its own distinct cache. The cache is a circular fixed size cache. If the cache has a maximum diff --git a/docs/user-manual/en/embedding-activemq.md b/docs/user-manual/en/embedding-activemq.md index e2383c0635..dced121907 100644 --- a/docs/user-manual/en/embedding-activemq.md +++ b/docs/user-manual/en/embedding-activemq.md @@ -1,36 +1,36 @@ -# Embedding Apache ActiveMQ +# Embedding Apache ActiveMQ Artemis -Apache ActiveMQ is designed as set of simple Plain Old Java Objects (POJOs). -This means Apache ActiveMQ can be instantiated and run in any dependency +Apache ActiveMQ Artemis is designed as set of simple Plain Old Java Objects (POJOs). +This means Apache ActiveMQ Artemis can be instantiated and run in any dependency injection framework such as Spring or Google Guice. It also means that if you have an application that could use messaging functionality internally, then it can *directly instantiate* -Apache ActiveMQ clients and servers in its own application code to perform that -functionality. We call this *embedding* Apache ActiveMQ. +Apache ActiveMQ Artemis clients and servers in its own application code to perform that +functionality. We call this *embedding* Apache ActiveMQ Artemis. Examples of applications that might want to do this include any application that needs very high performance, transactional, persistent messaging but doesn't want the hassle of writing it all from scratch. -Embedding Apache ActiveMQ can be done in very few easy steps. Instantiate the +Embedding Apache ActiveMQ Artemis can be done in very few easy steps. Instantiate the configuration object, instantiate the server, start it, and you have a -Apache ActiveMQ running in your virtual machine. It's as simple and easy as +Apache ActiveMQ Artemis running in your virtual machine. It's as simple and easy as that. ## Simple Config File Embedding -The simplest way to embed Apache ActiveMQ is to use the embedded wrapper -classes and configure Apache ActiveMQ through its configuration files. There +The simplest way to embed Apache ActiveMQ Artemis is to use the embedded wrapper +classes and configure Apache ActiveMQ Artemis through its configuration files. There are two different helper classes for this depending on whether your -using the Apache ActiveMQ Core API or JMS. +using the Apache ActiveMQ Artemis Core API or JMS. ## Core API Only -For instantiating a core Apache ActiveMQ Server only, the steps are pretty +For instantiating a core Apache ActiveMQ Artemis Server only, the steps are pretty simple. The example requires that you have defined a configuration file `activemq-configuration.xml` in your classpath: ``` java -import org.apache.activemq.core.server.embedded.EmbeddedActiveMQ; +import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; ... @@ -102,10 +102,10 @@ javadocs for this class for more details on other config options. ## POJO instantiation - Embedding Programmatically You can follow this step-by-step guide to programmatically embed the -core, non-JMS Apache ActiveMQ Server instance: +core, non-JMS Apache ActiveMQ Artemis Server instance: Create the configuration object - this contains configuration -information for an Apache ActiveMQ instance. The setter methods of this class +information for an Apache ActiveMQ Artemis instance. The setter methods of this class allow you to programmatically set configuration options as describe in the [Server Configuration](configuration-index.md) section. @@ -114,8 +114,8 @@ The acceptors are configured through `ConfigurationImpl`. Just add the the main configuration file. ``` java -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; ... @@ -133,8 +133,8 @@ You need to instantiate an instance of the configuration object to it. ``` java -import org.apache.activemq.api.core.server.ActiveMQ; -import org.apache.activemq.core.server.embedded.EmbeddedActiveMQ; +import org.apache.activemq.artemis.api.core.server.ActiveMQ; +import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; ... @@ -158,7 +158,7 @@ then set the JmsConfiguration property of the EmbeddedJMS class. Here is an example of this: ``` java -// Step 1. Create Apache ActiveMQ core configuration, and set the properties accordingly +// Step 1. Create Apache ActiveMQ Artemis core configuration, and set the properties accordingly Configuration configuration = new ConfigurationImpl(); configuration.setPersistenceEnabled(false); configuration.setSecurityEnabled(false); @@ -176,20 +176,20 @@ jmsConfig.getConnectionFactoryConfigurations().add(cfConfig); JMSQueueConfiguration queueConfig = new JMSQueueConfigurationImpl("queue1", null, false, "/queue/queue1"); jmsConfig.getQueueConfigurations().add(queueConfig); -// Step 5. Start the JMS Server using the Apache ActiveMQ core server and the JMS configuration +// Step 5. Start the JMS Server using the Apache ActiveMQ Artemis core server and the JMS configuration EmbeddedJMS jmsServer = new EmbeddedJMS(); jmsServer.setConfiguration(configuration); jmsServer.setJmsConfiguration(jmsConfig); jmsServer.start(); ``` -Please see the examples for an example which shows how to setup and run Apache ActiveMQ +Please see the examples for an example which shows how to setup and run Apache ActiveMQ Artemis embedded with JMS. ## Dependency Frameworks You may also choose to use a dependency injection framework such as The Spring Framework. See [Spring Integration](spring-integration.md) for more details on -Spring and Apache ActiveMQ. +Spring and Apache ActiveMQ Artemis. -Apache ActiveMQ standalone uses [Airline](https://github.com/airlift/airline) to bootstrap. +Apache ActiveMQ Artemis standalone uses [Airline](https://github.com/airlift/airline) to bootstrap. diff --git a/docs/user-manual/en/examples.md b/docs/user-manual/en/examples.md index 1725d09dc2..30e499ec1f 100644 --- a/docs/user-manual/en/examples.md +++ b/docs/user-manual/en/examples.md @@ -1,7 +1,7 @@ Examples ======== -The Apache ActiveMQ distribution comes with over 90 run out-of-the-box examples +The Apache ActiveMQ Artemis distribution comes with over 90 run out-of-the-box examples demonstrating many of the features. The examples are available in the distribution, in the `examples` @@ -39,11 +39,11 @@ Applet. Application-Layer Failover -------------------------- -Apache ActiveMQ also supports Application-Layer failover, useful in the case +Apache ActiveMQ Artemis also supports Application-Layer failover, useful in the case that replication is not enabled on the server side. With Application-Layer failover, it's up to the application to register -a JMS `ExceptionListener` with Apache ActiveMQ which will be called by Apache ActiveMQ +a JMS `ExceptionListener` with Apache ActiveMQ Artemis which will be called by Apache ActiveMQ Artemis in the event that connection failure is detected. The code in the `ExceptionListener` then recreates the JMS connection, @@ -64,7 +64,7 @@ The `bridge` example demonstrates a core bridge deployed on one server, which consumes messages from a local queue and forwards them to an address on a second server. -Core bridges are used to create message flows between any two Apache ActiveMQ +Core bridges are used to create message flows between any two Apache ActiveMQ Artemis servers which are remotely separated. Core bridges are resilient and will cope with temporary connection failure allowing them to be an ideal choice for forwarding over unreliable connections, e.g. a WAN. @@ -73,7 +73,7 @@ Browser ------- The `browser` example shows you how to use a JMS `QueueBrowser` with -Apache ActiveMQ. +Apache ActiveMQ Artemis. Queues are a standard part of JMS, please consult the JMS 1.1 specification for full details. @@ -99,7 +99,7 @@ Client-Side Load-Balancing The `client-side-load-balancing` example demonstrates how sessions created from a single JMS `Connection` can be created to different nodes -of the cluster. In other words it demonstrates how Apache ActiveMQ does +of the cluster. In other words it demonstrates how Apache ActiveMQ Artemis does client-side load-balancing of sessions across the cluster. Clustered Durable Subscription @@ -169,11 +169,11 @@ and we verify that both subscribers receive all the sent messages. Message Consumer Rate Limiting ------------------------------ -With Apache ActiveMQ you can specify a maximum consume rate at which a JMS +With Apache ActiveMQ Artemis you can specify a maximum consume rate at which a JMS MessageConsumer will consume messages. This can be specified when creating or deploying the connection factory. -If this value is specified then Apache ActiveMQ will ensure that messages are +If this value is specified then Apache ActiveMQ Artemis will ensure that messages are never consumed at a rate higher than the specified rate. This is a form of consumer throttling. @@ -197,7 +197,7 @@ can be consumed for further investigation. Delayed Redelivery ------------------ -The `delayed-redelivery` example demonstrates how Apache ActiveMQ can be +The `delayed-redelivery` example demonstrates how Apache ActiveMQ Artemis can be configured to provide a delayed redelivery in the case a message needs to be redelivered. @@ -210,7 +210,7 @@ succession, using up valuable CPU and network resources. Divert ------ -Apache ActiveMQ diverts allow messages to be transparently "diverted" or copied +Apache ActiveMQ Artemis diverts allow messages to be transparently "diverted" or copied from one address to another with just some simple configuration defined on the server side. @@ -218,7 +218,7 @@ Durable Subscription -------------------- The `durable-subscription` example shows you how to use a durable -subscription with Apache ActiveMQ. Durable subscriptions are a standard part of +subscription with Apache ActiveMQ Artemis. Durable subscriptions are a standard part of JMS, please consult the JMS 1.1 specification for full details. Unlike non-durable subscriptions, the key function of durable @@ -239,7 +239,7 @@ Embedded Simple --------------- The `embedded` example shows how to embed JMS within your own code using -regular Apache ActiveMQ XML files. +regular Apache ActiveMQ Artemis XML files. Message Expiration ------------------ @@ -250,12 +250,12 @@ limited period of time before being removed. JMS specification states that clients should not receive messages that have been expired (but it does not guarantee this will not happen). -Apache ActiveMQ can assign an expiry address to a given queue so that when +Apache ActiveMQ Artemis can assign an expiry address to a given queue so that when messages are expired, they are removed from the queue and sent to the expiry address. These "expired" messages can later be consumed from the expiry address for further inspection. -Apache ActiveMQ Resource Adapter example +Apache ActiveMQ Artemis Resource Adapter example --------------------------------- This examples shows how to build the activemq resource adapters a rar @@ -264,7 +264,7 @@ for deployment in other Application Server's HTTP Transport -------------- -The `http-transport` example shows you how to configure Apache ActiveMQ to use +The `http-transport` example shows you how to configure Apache ActiveMQ Artemis to use the HTTP protocol as its transport layer. Instantiate JMS Objects Directly @@ -275,22 +275,22 @@ instances are looked up from JNDI before being used by the client code. This objects are called "administered objects" in JMS terminology. However, in some cases a JNDI server may not be available or desired. To -come to the rescue Apache ActiveMQ also supports the direct instantiation of +come to the rescue Apache ActiveMQ Artemis also supports the direct instantiation of these administered objects on the client side so you don't have to use JNDI for JMS. Interceptor ----------- -Apache ActiveMQ allows an application to use an interceptor to hook into the +Apache ActiveMQ Artemis allows an application to use an interceptor to hook into the messaging system. Interceptors allow you to handle various message -events in Apache ActiveMQ. +events in Apache ActiveMQ Artemis. JAAS ---- -The `jaas` example shows you how to configure Apache ActiveMQ to use JAAS for -security. Apache ActiveMQ can leverage JAAS to delegate user authentication and +The `jaas` example shows you how to configure Apache ActiveMQ Artemis to use JAAS for +security. Apache ActiveMQ Artemis can leverage JAAS to delegate user authentication and authorization to existing security infrastructure. JMS Auto Closable @@ -304,20 +304,20 @@ JMS Completion Listener ----------------------- The `jms-completion-listener` example shows how to send a message -asynchronously to Apache ActiveMQ and use a CompletionListener to be notified +asynchronously to Apache ActiveMQ Artemis and use a CompletionListener to be notified of the Broker receiving it. JMS Bridge ---------- The `jms-brige` example shows how to setup a bridge between two -standalone Apache ActiveMQ servers. +standalone Apache ActiveMQ Artemis servers. JMS Context ----------- The `jms-context` example shows how to send and receive a message to a -JMS Queue using Apache ActiveMQ by using a JMS Context. +JMS Queue using Apache ActiveMQ Artemis by using a JMS Context. A JMSContext is part of JMS 2.0 and combines the JMS Connection and Session Objects into a simple Interface. @@ -333,19 +333,19 @@ so you can share the load across different threads and connections. JMX Management -------------- -The `jmx` example shows how to manage Apache ActiveMQ using JMX. +The `jmx` example shows how to manage Apache ActiveMQ Artemis using JMX. Large Message ------------- The `large-message` example shows you how to send and receive very large -messages with Apache ActiveMQ. Apache ActiveMQ supports the sending and receiving of +messages with Apache ActiveMQ Artemis. Apache ActiveMQ Artemis supports the sending and receiving of huge messages, much larger than can fit in available RAM on the client or server. Effectively the only limit to message size is the amount of disk space you have on the server. Large messages are persisted on the server so they can survive a server -restart. In other words Apache ActiveMQ doesn't just do a simple socket stream +restart. In other words Apache ActiveMQ Artemis doesn't just do a simple socket stream from the sender to the consumer. Last-Value Queue @@ -363,14 +363,14 @@ are only interested by the latest price for a particular stock. Management ---------- -The `management` example shows how to manage Apache ActiveMQ using JMS Messages +The `management` example shows how to manage Apache ActiveMQ Artemis using JMS Messages to invoke management operations on the server. Management Notification ----------------------- The `management-notification` example shows how to receive management -notifications from Apache ActiveMQ using JMS messages. Apache ActiveMQ servers emit +notifications from Apache ActiveMQ Artemis using JMS messages. Apache ActiveMQ Artemis servers emit management notifications when events of interest occur (consumers are created or closed, addresses are created or deleted, security authentication fails, etc.). @@ -385,7 +385,7 @@ Message Group ------------- The `message-group` example shows you how to configure and use message -groups with Apache ActiveMQ. Message groups allow you to pin messages so they +groups with Apache ActiveMQ Artemis. Message groups allow you to pin messages so they are only consumed by a single consumer. Message groups are sets of messages that has the following characteristics: @@ -399,7 +399,7 @@ Message Group ------------- The `message-group2` example shows you how to configure and use message -groups with Apache ActiveMQ via a connection factory. +groups with Apache ActiveMQ Artemis via a connection factory. Message Priority ---------------- @@ -434,19 +434,19 @@ backups but forcing failover back to the original live server No Consumer Buffering --------------------- -By default, Apache ActiveMQ consumers buffer messages from the server in a +By default, Apache ActiveMQ Artemis consumers buffer messages from the server in a client side buffer before you actually receive them on the client side. This improves performance since otherwise every time you called receive() or had processed the last message in a -`MessageListener onMessage()` method, the Apache ActiveMQ client would have to +`MessageListener onMessage()` method, the Apache ActiveMQ Artemis client would have to go the server to request the next message, which would then get sent to the client side, if one was available. This would involve a network round trip for every message and reduce -performance. Therefore, by default, Apache ActiveMQ pre-fetches messages into a +performance. Therefore, by default, Apache ActiveMQ Artemis pre-fetches messages into a buffer on each consumer. -In some case buffering is not desirable, and Apache ActiveMQ allows it to be +In some case buffering is not desirable, and Apache ActiveMQ Artemis allows it to be switched off. This example demonstrates that. Non-Transaction Failover With Server Data Replication @@ -457,7 +457,7 @@ as a live-backup pair for high availability (HA), and a client using a *non-transacted* JMS session failing over from live to backup when the live server is crashed. -Apache ActiveMQ implements failover of client connections between live and +Apache ActiveMQ Artemis implements failover of client connections between live and backup servers. This is implemented by the replication of state between live and backup nodes. When replication is configured and a live node crashes, the client connections can carry and continue to send and @@ -468,13 +468,13 @@ messages will be lost or delivered twice. OpenWire -------- -The `Openwire` example shows how to configure an Apache ActiveMQ server to -communicate with an Apache ActiveMQ JMS client that uses open-wire protocol. +The `Openwire` example shows how to configure an Apache ActiveMQ Artemis server to +communicate with an Apache ActiveMQ Artemis JMS client that uses open-wire protocol. Paging ------ -The `paging` example shows how Apache ActiveMQ can support huge queues even +The `paging` example shows how Apache ActiveMQ Artemis can support huge queues even when the server is running in limited RAM. It does this by transparently *paging* messages to disk, and *depaging* them when they are required. @@ -490,27 +490,27 @@ All of these standard modes involve sending acknowledgements from the client to the server. However in some cases, you really don't mind losing messages in event of failure, so it would make sense to acknowledge the message on the server before delivering it to the -client. This example demonstrates how Apache ActiveMQ allows this with an extra +client. This example demonstrates how Apache ActiveMQ Artemis allows this with an extra acknowledgement mode. Message Producer Rate Limiting ------------------------------ -The `producer-rte-limit` example demonstrates how, with Apache ActiveMQ, you +The `producer-rte-limit` example demonstrates how, with Apache ActiveMQ Artemis, you can specify a maximum send rate at which a JMS message producer will send messages. Proton Qpid ----------- -Apache ActiveMQ can be configured to accept requests from any AMQP client that +Apache ActiveMQ Artemis can be configured to accept requests from any AMQP client that supports the 1.0 version of the protocol. This `proton-j` example shows a simply qpid java 1.0 client example. Proton Ruby ----------- -Apache ActiveMQ can be configured to accept requests from any AMQP client that +Apache ActiveMQ Artemis can be configured to accept requests from any AMQP client that supports the 1.0 version of the protocol. This example shows a simply proton ruby client that sends and receives messages @@ -542,7 +542,7 @@ Reattach Node example The `Reattach Node` example shows how a client can try to reconnect to the same server instead of failing the connection immediately and -notifying any user ExceptionListener objects. Apache ActiveMQ can be configured +notifying any user ExceptionListener objects. Apache ActiveMQ Artemis can be configured to automatically retry the connection, and reattach to the server when it becomes available again across the network. @@ -581,25 +581,25 @@ A simple example showing the JMS request-response pattern. Rest example ------------ -An example showing how to use the Apache ActiveMQ Rest API +An example showing how to use the Apache ActiveMQ Artemis Rest API Scheduled Message ----------------- The `scheduled-message` example shows you how to send a scheduled -message to a JMS Queue with Apache ActiveMQ. Scheduled messages won't get +message to a JMS Queue with Apache ActiveMQ Artemis. Scheduled messages won't get delivered until a specified time in the future. Security -------- The `security` example shows you how configure and use role based queue -security with Apache ActiveMQ. +security with Apache ActiveMQ Artemis. Send Acknowledgements --------------------- -The `send-acknowledgements` example shows you how to use Apache ActiveMQ's +The `send-acknowledgements` example shows you how to use Apache ActiveMQ Artemis's advanced *asynchronous send acknowledgements* feature to obtain acknowledgement from the server that sends have been received and processed in a separate stream to the sent messages. @@ -607,49 +607,49 @@ processed in a separate stream to the sent messages. Spring Integration ------------------ -This example shows how to use embedded JMS using Apache ActiveMQ's Spring +This example shows how to use embedded JMS using Apache ActiveMQ Artemis's Spring integration. SSL Transport ------------- -The `ssl-enabled` shows you how to configure SSL with Apache ActiveMQ to send +The `ssl-enabled` shows you how to configure SSL with Apache ActiveMQ Artemis to send and receive message. Static Message Selector ----------------------- -The `static-selector` example shows you how to configure an Apache ActiveMQ core +The `static-selector` example shows you how to configure an Apache ActiveMQ Artemis core queue with static message selectors (filters). Static Message Selector Using JMS --------------------------------- -The `static-selector-jms` example shows you how to configure an Apache ActiveMQ +The `static-selector-jms` example shows you how to configure an Apache ActiveMQ Artemis queue with static message selectors (filters) using JMS. Stomp ----- -The `stomp` example shows you how to configure an Apache ActiveMQ server to send +The `stomp` example shows you how to configure an Apache ActiveMQ Artemis server to send and receive Stomp messages. Stomp1.1 -------- -The `stomp` example shows you how to configure an Apache ActiveMQ server to send +The `stomp` example shows you how to configure an Apache ActiveMQ Artemis server to send and receive Stomp messages via a Stomp 1.1 connection. Stomp1.2 -------- -The `stomp` example shows you how to configure an Apache ActiveMQ server to send +The `stomp` example shows you how to configure an Apache ActiveMQ Artemis server to send and receive Stomp messages via a Stomp 1.2 connection. Stomp Over Web Sockets ---------------------- -The `stomp-websockets` example shows you how to configure an Apache ActiveMQ +The `stomp-websockets` example shows you how to configure an Apache ActiveMQ Artemis server to send and receive Stomp messages directly from Web browsers (provided they support Web Sockets). @@ -657,9 +657,9 @@ Symmetric Cluster ----------------- The `symmetric-cluster` example demonstrates a symmetric cluster set-up -with Apache ActiveMQ. +with Apache ActiveMQ Artemis. -Apache ActiveMQ has extremely flexible clustering which allows you to set-up +Apache ActiveMQ Artemis has extremely flexible clustering which allows you to set-up servers in many different topologies. The most common topology that you'll perhaps be familiar with if you are used to application server clustering is a symmetric cluster. @@ -681,7 +681,7 @@ A simple example demonstrating a JMS topic. Topic Hierarchy --------------- -Apache ActiveMQ supports topic hierarchies. With a topic hierarchy you can +Apache ActiveMQ Artemis supports topic hierarchies. With a topic hierarchy you can register a subscriber with a wild-card and that subscriber will receive any messages sent to an address that matches the wild card. @@ -689,7 +689,7 @@ Topic Selector 1 ---------------- The `topic-selector-example1` example shows you how to send message to a -JMS Topic, and subscribe them using selectors with Apache ActiveMQ. +JMS Topic, and subscribe them using selectors with Apache ActiveMQ Artemis. Topic Selector 2 ---------------- @@ -705,7 +705,7 @@ live-backup pair for high availability (HA), and a client using a transacted JMS session failing over from live to backup when the live server is crashed. -Apache ActiveMQ implements failover of client connections between live and +Apache ActiveMQ Artemis implements failover of client connections between live and backup servers. This is implemented by the sharing of a journal between the servers. When a live node crashes, the client connections can carry and continue to send and consume messages. When transacted sessions are @@ -722,13 +722,13 @@ Transactional Session --------------------- The `transactional` example shows you how to use a transactional Session -with Apache ActiveMQ. +with Apache ActiveMQ Artemis. XA Heuristic ------------ The `xa-heuristic` example shows you how to make an XA heuristic -decision through Apache ActiveMQ Management Interface. A heuristic decision is +decision through Apache ActiveMQ Artemis Management Interface. A heuristic decision is a unilateral decision to commit or rollback an XA transaction branch after it has been prepared. @@ -736,13 +736,13 @@ XA Receive ---------- The `xa-receive` example shows you how message receiving behaves in an -XA transaction in Apache ActiveMQ. +XA transaction in Apache ActiveMQ Artemis. XA Send ------- The `xa-send` example shows you how message sending behaves in an XA -transaction in Apache ActiveMQ. +transaction in Apache ActiveMQ Artemis. Core API Examples ================= @@ -752,5 +752,5 @@ directory and type `ant` Embedded -------- -The `embedded` example shows how to embed the Apache ActiveMQ server within +The `embedded` example shows how to embed the Apache ActiveMQ Artemis server within your own code. diff --git a/docs/user-manual/en/filter-expressions.md b/docs/user-manual/en/filter-expressions.md index 4375dc04ca..a958a9dd65 100644 --- a/docs/user-manual/en/filter-expressions.md +++ b/docs/user-manual/en/filter-expressions.md @@ -1,6 +1,6 @@ # Filter Expressions -Apache ActiveMQ provides a powerful filter language based on a subset of the +Apache ActiveMQ Artemis provides a powerful filter language based on a subset of the SQL 92 expression syntax. It is the same as the syntax used for JMS selectors, but the predefined @@ -8,7 +8,7 @@ identifiers are different. For documentation on JMS selector syntax please the JMS javadoc for [javax.jms.Message](http://docs.oracle.com/javaee/6/api/javax/jms/Message.html). -Filter expressions are used in several places in Apache ActiveMQ +Filter expressions are used in several places in Apache ActiveMQ Artemis - Predefined Queues. When pre-defining a queue, in `activemq-configuration.xml` in either the core or jms configuration a filter @@ -24,9 +24,9 @@ Filter expressions are used in several places in Apache ActiveMQ - Filter are also used programmatically when creating consumers, queues and in several places as described in [management](management.md). -There are some differences between JMS selector expressions and Apache ActiveMQ +There are some differences between JMS selector expressions and Apache ActiveMQ Artemis core filter expressions. Whereas JMS selector expressions operate on a -JMS message, Apache ActiveMQ core filter expressions operate on a core message. +JMS message, Apache ActiveMQ Artemis core filter expressions operate on a core message. The following identifiers can be used in a core filter expressions to refer to attributes of the core message in an expression: diff --git a/docs/user-manual/en/flow-control.md b/docs/user-manual/en/flow-control.md index 0f9ce429e1..92eabb0032 100644 --- a/docs/user-manual/en/flow-control.md +++ b/docs/user-manual/en/flow-control.md @@ -17,17 +17,17 @@ they cannot be processed in time. ## Window-Based Flow Control -By default, Apache ActiveMQ consumers buffer messages from the server in a +By default, Apache ActiveMQ Artemis consumers buffer messages from the server in a client side buffer before the client consumes them. This improves performance: otherwise every time the client consumes a message, -Apache ActiveMQ would have to go the server to request the next message. In +Apache ActiveMQ Artemis would have to go the server to request the next message. In turn, this message would then get sent to the client side, if one was available. A network round trip would be involved for *every* message and considerably reduce performance. -To prevent this, Apache ActiveMQ pre-fetches messages into a buffer on each +To prevent this, Apache ActiveMQ Artemis pre-fetches messages into a buffer on each consumer. The total maximum size of messages (in bytes) that will be buffered on each consumer is determined by the `consumerWindowSize` parameter. @@ -89,7 +89,7 @@ of 1MiB is fine in most cases. ### Using Core API -If Apache ActiveMQ Core API is used, the consumer window size is specified by +If Apache ActiveMQ Artemis Core API is used, the consumer window size is specified by `ServerLocator.setConsumerWindowSize()` method and some of the `ClientSession.createConsumer()` methods. @@ -101,14 +101,14 @@ environment, e.g. `jndi.properties`. Here's a simple example using the "ConnectionFactory" connection factory which is available in the context by default: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.myConnectionFactory=tcp://localhost:61616?consumerWindowSize=0 If the connection factory is directly instantiated, the consumer window size is specified by `ActiveMQConnectionFactory.setConsumerWindowSize()` method. -Please see the examples for an example which shows how to configure Apache ActiveMQ to +Please see the examples for an example which shows how to configure Apache ActiveMQ Artemis to prevent consumer buffering when dealing with slow consumers. ## Rate limited flow control @@ -127,7 +127,7 @@ Please see ? for a working example of limiting consumer rate. ### Using Core API -If the Apache ActiveMQ core API is being used the rate can be set via the +If the Apache ActiveMQ Artemis core API is being used the rate can be set via the `ServerLocator.setConsumerMaxRate(int consumerMaxRate)` method or alternatively via some of the `ClientSession.createConsumer()` methods. @@ -138,7 +138,7 @@ max rate can be configured in the JNDI context environment, e.g. `jndi.properties`. Here's a simple example using the "ConnectionFactory" connection factory which is available in the context by default: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory java.naming.provider.url=tcp://localhost:61616?consumerMaxRate=10 If the connection factory is directly instantiated, the max rate size @@ -158,12 +158,12 @@ prevent consumer buffering when dealing with slow consumers. ## Producer flow control -Apache ActiveMQ also can limit the amount of data sent from a client to a +Apache ActiveMQ Artemis also can limit the amount of data sent from a client to a server to prevent the server being overwhelmed. ### Window based flow control -In a similar way to consumer window based flow control, Apache ActiveMQ +In a similar way to consumer window based flow control, Apache ActiveMQ Artemis producers, by default, can only send messages to an address as long as they have sufficient credits to do so. The amount of credits required to send a message is given by the size of the message. @@ -180,7 +180,7 @@ prevents the remoting connection from getting overloaded. #### Using Core API -If the Apache ActiveMQ core API is being used, window size can be set via the +If the Apache ActiveMQ Artemis core API is being used, window size can be set via the `ServerLocator.setProducerWindowSize(int producerWindowSize)` method. #### Using JMS @@ -191,7 +191,7 @@ e.g. `jndi.properties`. Here's a simple example using the "ConnectionFactory" connection factory which is available in the context by default: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.myConnectionFactory=tcp://localhost:61616?producerWindowSize=10 If the connection factory is directly instantiated, the producer window @@ -260,8 +260,8 @@ control. ### Rate limited flow control -Apache ActiveMQ also allows the rate a producer can emit message to be limited, -in units of messages per second. By specifying such a rate, Apache ActiveMQ +Apache ActiveMQ Artemis also allows the rate a producer can emit message to be limited, +in units of messages per second. By specifying such a rate, Apache ActiveMQ Artemis will ensure that producer never produces messages at a rate higher than that specified. @@ -274,7 +274,7 @@ Please see [the examples chapter](examples.md) for a working example of limiting #### Using Core API -If the Apache ActiveMQ core API is being used the rate can be set via the +If the Apache ActiveMQ Artemis core API is being used the rate can be set via the `ServerLocator.setProducerMaxRate(int producerMaxRate)` method or alternatively via some of the `ClientSession.createProducer()` methods. @@ -285,7 +285,7 @@ max rate size can be configured in the JNDI context environment, e.g. `jndi.properties`. Here's a simple example using the "ConnectionFactory" connection factory which is available in the context by default: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.myConnectionFactory=tcp://localhost:61616?producerMaxRate=10 If the connection factory is directly instantiated, the max rate size diff --git a/docs/user-manual/en/ha.md b/docs/user-manual/en/ha.md index 445ba8f320..2819006e55 100644 --- a/docs/user-manual/en/ha.md +++ b/docs/user-manual/en/ha.md @@ -9,14 +9,14 @@ event of server failure so client applications can continue to operate*. ## Live - Backup Groups -Apache ActiveMQ allows servers to be linked together as *live - backup* groups +Apache ActiveMQ Artemis allows servers to be linked together as *live - backup* groups where each live server can have 1 or more backup servers. A backup server is owned by only one live server. Backup servers are not operational until failover occurs, however 1 chosen backup, which will be in passive mode, announces its status and waits to take over the live servers work -Before failover, only the live server is serving the Apache ActiveMQ clients +Before failover, only the live server is serving the Apache ActiveMQ Artemis clients while the backup servers remain passive or awaiting to become a backup server. When a live server crashes or is brought down in the correct mode, the backup server currently in passive mode will become live and @@ -28,7 +28,7 @@ live server coming back up and automatically stop. ### HA Policies -Apache ActiveMQ supports two different strategies for backing up a server +Apache ActiveMQ Artemis supports two different strategies for backing up a server *shared store* and *replication*. Which is configured via the `ha-policy` configuration element. @@ -789,13 +789,13 @@ be high enough to deal with the time needed to scale down. ## Failover Modes -Apache ActiveMQ defines two types of client failover: +Apache ActiveMQ Artemis defines two types of client failover: - Automatic client failover - Application-level client failover -Apache ActiveMQ also provides 100% transparent automatic reattachment of +Apache ActiveMQ Artemis also provides 100% transparent automatic reattachment of connections to the same server (e.g. in case of transient network problems). This is similar to failover, except it is reconnecting to the same server and is discussed in [Client Reconnection and Session Reattachment](client-reconnection.md) @@ -807,14 +807,14 @@ knowledge of non persistent queues. ### Automatic Client Failover -Apache ActiveMQ clients can be configured to receive knowledge of all live and +Apache ActiveMQ Artemis clients can be configured to receive knowledge of all live and backup servers, so that in event of connection failure at the client - live server connection, the client will detect this and reconnect to the backup server. The backup server will then automatically recreate any sessions and consumers that existed on each connection before failover, thus saving the user from having to hand-code manual reconnection logic. -Apache ActiveMQ clients detect connection failure when it has not received +Apache ActiveMQ Artemis clients detect connection failure when it has not received packets from the server within the time given by `client-failure-check-period` as explained in section [Detecting Dead Connections](connection-ttl.md). If the client does not receive data in good time, it will assume the connection has @@ -822,7 +822,7 @@ failed and attempt failover. Also if the socket is closed by the OS, usually if the server process is killed rather than the machine itself crashing, then the client will failover straight away. -Apache ActiveMQ clients can be configured to discover the list of live-backup +Apache ActiveMQ Artemis clients can be configured to discover the list of live-backup server groups in a number of different ways. They can be configured explicitly or probably the most common way of doing this is to use *server discovery* for the client to automatically discover the list. @@ -857,7 +857,7 @@ JMS sessions, please see [the examples](examples.md) chapter. #### A Note on Server Replication -Apache ActiveMQ does not replicate full server state between live and backup +Apache ActiveMQ Artemis does not replicate full server state between live and backup servers. When the new session is automatically recreated on the backup it won't have any knowledge of messages already sent or acknowledged in that session. Any in-flight sends or acknowledgements at the time of @@ -898,14 +898,14 @@ session will not have any knowledge of the call that was in progress. This call might otherwise hang for ever, waiting for a response that will never come. -To prevent this, Apache ActiveMQ will unblock any blocking calls that were in +To prevent this, Apache ActiveMQ Artemis will unblock any blocking calls that were in progress at the time of failover by making them throw a `javax.jms.JMSException` (if using JMS), or a `ActiveMQException` with error code `ActiveMQException.UNBLOCKED`. It is up to the client code to catch this exception and retry any operations if desired. If the method being unblocked is a call to commit(), or prepare(), then -the transaction will be automatically rolled back and Apache ActiveMQ will +the transaction will be automatically rolled back and Apache ActiveMQ Artemis will throw a `javax.jms.TransactionRolledBackException` (if using JMS), or a `ActiveMQException` with error code `ActiveMQException.TRANSACTION_ROLLED_BACK` if using the core API. @@ -940,7 +940,7 @@ local rollback code as necessary. There is no need to manually rollback the session - it is already rolled back. The user can then just retry the transactional operations again on the same session. -Apache ActiveMQ ships with a fully functioning example demonstrating how to do +Apache ActiveMQ Artemis ships with a fully functioning example demonstrating how to do this, please see [the examples](examples.md) chapter. If failover occurs when a commit call is being executed, the server, as @@ -990,8 +990,8 @@ connection failure: `java.jms.ExceptionListener`. Please consult the JMS javadoc or any good JMS tutorial for more information on how to use this. -The Apache ActiveMQ core API also provides a similar feature in the form of the -class `org.apache.activemq.core.client.SessionFailureListener` +The Apache ActiveMQ Artemis core API also provides a similar feature in the form of the +class `org.apache.activemq.artemis.core.client.SessionFailureListener` Any ExceptionListener or SessionFailureListener instance will always be called by ActiveMQ on event of connection failure, **irrespective** of @@ -1037,7 +1037,7 @@ application level. To implement application-level failover, if you're using JMS then you need to set an `ExceptionListener` class on the JMS connection. The -`ExceptionListener` will be called by Apache ActiveMQ in the event that +`ExceptionListener` will be called by Apache ActiveMQ Artemis in the event that connection failure is detected. In your `ExceptionListener`, you would close your old JMS connections, potentially look up new connection factory instances from JNDI and creating new connections. diff --git a/docs/user-manual/en/images/architecture1.jpg b/docs/user-manual/en/images/architecture1.jpg index 3320b0304e..c36bf73933 100644 Binary files a/docs/user-manual/en/images/architecture1.jpg and b/docs/user-manual/en/images/architecture1.jpg differ diff --git a/docs/user-manual/en/images/architecture2.jpg b/docs/user-manual/en/images/architecture2.jpg index 9645f34bef..391c1c01b3 100644 Binary files a/docs/user-manual/en/images/architecture2.jpg and b/docs/user-manual/en/images/architecture2.jpg differ diff --git a/docs/user-manual/en/images/architecture3.jpg b/docs/user-manual/en/images/architecture3.jpg index f8c250a9f1..7dccab73ed 100644 Binary files a/docs/user-manual/en/images/architecture3.jpg and b/docs/user-manual/en/images/architecture3.jpg differ diff --git a/docs/user-manual/en/intercepting-operations.md b/docs/user-manual/en/intercepting-operations.md index ad036880d8..f33611bc67 100644 --- a/docs/user-manual/en/intercepting-operations.md +++ b/docs/user-manual/en/intercepting-operations.md @@ -1,6 +1,6 @@ # Intercepting Operations -Apache ActiveMQ supports *interceptors* to intercept packets entering and +Apache ActiveMQ Artemis supports *interceptors* to intercept packets entering and exiting the server. Incoming and outgoing interceptors are be called for any packet entering or exiting the server respectively. This allows custom code to be executed, e.g. for auditing packets, filtering or @@ -23,7 +23,7 @@ public interface Interceptor For stomp protocol an interceptor must implement the `StompFrameInterceptor class`: ``` java -package org.apache.activemq.core.protocol.stomp; +package org.apache.activemq.artemis.core.protocol.stomp; public interface StompFrameInterceptor { diff --git a/docs/user-manual/en/interoperability.md b/docs/user-manual/en/interoperability.md index 3ce110281c..914128da8b 100644 --- a/docs/user-manual/en/interoperability.md +++ b/docs/user-manual/en/interoperability.md @@ -3,7 +3,7 @@ ## Stomp [Stomp](http://stomp.github.com/) is a text-orientated wire protocol -that allows Stomp clients to communicate with Stomp Brokers. Apache ActiveMQ +that allows Stomp clients to communicate with Stomp Brokers. Apache ActiveMQ Artemis now supports Stomp 1.0, 1.1 and 1.2. Stomp clients are available for several languages and platforms making @@ -11,16 +11,16 @@ it a good choice for interoperability. ## Native Stomp support -Apache ActiveMQ provides native support for Stomp. To be able to send and +Apache ActiveMQ Artemis provides native support for Stomp. To be able to send and receive Stomp messages, you must configure a `NettyAcceptor` with a `protocols` parameter set to have `stomp`: tcp://localhost:61613?protocols=STOMP -With this configuration, Apache ActiveMQ will accept Stomp connections on the +With this configuration, Apache ActiveMQ Artemis will accept Stomp connections on the port `61613` (which is the default port of the Stomp brokers). -See the `stomp` example which shows how to configure an Apache ActiveMQ server +See the `stomp` example which shows how to configure an Apache ActiveMQ Artemis server with Stomp. ### Limitations @@ -33,30 +33,30 @@ set). #### Virtual Hosting -Apache ActiveMQ currently doesn't support virtual hosting, which means the +Apache ActiveMQ Artemis currently doesn't support virtual hosting, which means the 'host' header in CONNECT fram will be ignored. #### Heart-beating -Apache ActiveMQ specifies a minimum value for both client and server heart-beat +Apache ActiveMQ Artemis specifies a minimum value for both client and server heart-beat intervals. The minimum interval for both client and server heartbeats is 500 milliseconds. That means if a client sends a CONNECT frame with heartbeat values lower than 500, the server will defaults the value to 500 milliseconds regardless the values of the 'heart-beat' header in the frame. -### Mapping Stomp destinations to Apache ActiveMQ addresses and queues +### Mapping Stomp destinations to Apache ActiveMQ Artemis addresses and queues Stomp clients deals with *destinations* when sending messages and subscribing. Destination names are simply strings which are mapped to some form of destination on the server - how the server translates these is left to the server implementation. -In Apache ActiveMQ, these destinations are mapped to *addresses* and *queues*. +In Apache ActiveMQ Artemis, these destinations are mapped to *addresses* and *queues*. When a Stomp client sends a message (using a `SEND` frame), the specified destination is mapped to an address. When a Stomp client subscribes (or unsubscribes) for a destination (using a `SUBSCRIBE` or -`UNSUBSCRIBE` frame), the destination is mapped to an Apache ActiveMQ queue. +`UNSUBSCRIBE` frame), the destination is mapped to an Apache ActiveMQ Artemis queue. ### STOMP and connection-ttl @@ -96,7 +96,7 @@ seconds. #### Using JMS destinations As explained in [Mapping JMS Concepts to the Core API](jms-core-mapping.md), -JMS destinations are also mapped to Apache ActiveMQ +JMS destinations are also mapped to Apache ActiveMQ Artemis addresses and queues. If you want to use Stomp to send messages to JMS destinations, the Stomp destinations must follow the same convention: @@ -123,10 +123,10 @@ destinations, the Stomp destinations must follow the same convention: ^@ -#### Sending and consuming Stomp message from JMS or Apache ActiveMQ Core API +#### Sending and consuming Stomp message from JMS or Apache ActiveMQ Artemis Core API Stomp is mainly a text-orientated protocol. To make it simpler to -interoperate with JMS and Apache ActiveMQ Core API, our Stomp implementation +interoperate with JMS and Apache ActiveMQ Artemis Core API, our Stomp implementation checks for presence of the `content-length` header to decide how to map a Stomp message to a JMS Message or a Core message. @@ -147,7 +147,7 @@ header to determine the type of the message body (String or bytes). When receiving Stomp messages via a JMS consumer or a QueueBrowser, the messages have no properties like JMSMessageID by default. However this may bring some inconvenience to clients who wants an ID for their -purpose. Apache ActiveMQ Stomp provides a parameter to enable message ID on +purpose. Apache ActiveMQ Artemis Stomp provides a parameter to enable message ID on each incoming Stomp message. If you want each Stomp message to have a unique ID, just set the `stompEnableMessageId` to true. For example: @@ -167,15 +167,15 @@ default is `false`. #### Handling of Large Messages with Stomp Stomp clients may send very large bodys of frames which can exceed the -size of Apache ActiveMQ server's internal buffer, causing unexpected errors. To -prevent this situation from happening, Apache ActiveMQ provides a stomp +size of Apache ActiveMQ Artemis server's internal buffer, causing unexpected errors. To +prevent this situation from happening, Apache ActiveMQ Artemis provides a stomp configuration attribute `stompMinLargeMessageSize`. This attribute can be configured inside a stomp acceptor, as a parameter. For example: tcp://localhost:61613?protocols=STOMP;stompMinLargeMessageSize=10240 The type of this attribute is integer. When this attributed is -configured, Apache ActiveMQ server will check the size of the body of each +configured, Apache ActiveMQ Artemis server will check the size of the body of each Stomp frame arrived from connections established with this acceptor. If the size of the body is equal or greater than the value of `stompMinLargeMessageSize`, the message will be persisted as a large @@ -190,16 +190,16 @@ sending it to stomp clients. The default value of ### Stomp Over Web Sockets -Apache ActiveMQ also support Stomp over [Web +Apache ActiveMQ Artemis also support Stomp over [Web Sockets](http://dev.w3.org/html5/websockets/). Modern web browser which -support Web Sockets can send and receive Stomp messages from Apache ActiveMQ. +support Web Sockets can send and receive Stomp messages from Apache ActiveMQ Artemis. To enable Stomp over Web Sockets, you must configure a `NettyAcceptor` with a `protocol` parameter set to `stomp_ws`: tcp://localhost:61614?protocols=STOMP_WS -With this configuration, Apache ActiveMQ will accept Stomp connections over Web +With this configuration, Apache ActiveMQ Artemis will accept Stomp connections over Web Sockets on the port `61614` with the URL path `/stomp`. Web browser can then connect to `ws://:61614/stomp` using a Web Socket to send and receive Stomp messages. @@ -209,7 +209,7 @@ available from [GitHub](http://github.com/jmesnil/stomp-websocket) (please see its [documentation](http://jmesnil.net/stomp-websocket/doc/) for a complete description). -The `stomp-websockets` example shows how to configure Apache ActiveMQ server to +The `stomp-websockets` example shows how to configure Apache ActiveMQ Artemis server to have web browsers and Java applications exchanges messages on a JMS topic. @@ -218,22 +218,22 @@ topic. [StompConnect](http://stomp.codehaus.org/StompConnect) is a server that can act as a Stomp broker and proxy the Stomp protocol to the standard JMS API. Consequently, using StompConnect it is possible to turn -Apache ActiveMQ into a Stomp Broker and use any of the available stomp clients. +Apache ActiveMQ Artemis into a Stomp Broker and use any of the available stomp clients. These include clients written in C, C++, c\# and .net etc. -To run StompConnect first start the Apache ActiveMQ server and make sure that +To run StompConnect first start the Apache ActiveMQ Artemis server and make sure that it is using JNDI. Stomp requires the file `jndi.properties` to be available on the classpath. This should look something like: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory Configure any required JNDI resources in this file according to the documentation. Make sure this file is in the classpath along with the StompConnect jar -and the Apache ActiveMQ jars and simply run `java org.codehaus.stomp.jms.Main`. +and the Apache ActiveMQ Artemis jars and simply run `java org.codehaus.stomp.jms.Main`. ## REST @@ -241,7 +241,7 @@ Please see [Rest Interface](rest.md) ## AMQP -Apache ActiveMQ supports the [AMQP +Apache ActiveMQ Artemis supports the [AMQP 1.0](https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=amqp) specification. To enable AMQP you must configure a Netty Acceptor to receive AMQP clients, like so: @@ -249,7 +249,7 @@ receive AMQP clients, like so: tcp://localhost:5672?protocols=AMQP -Apache ActiveMQ will then accept AMQP 1.0 clients on port 5672 which is the +Apache ActiveMQ Artemis will then accept AMQP 1.0 clients on port 5672 which is the default AMQP port. There are 2 Stomp examples available see proton-j and proton-ruby which @@ -257,18 +257,18 @@ use the qpid Java and Ruby clients respectively ### AMQP and security -The Apache ActiveMQ Server accepts AMQP SASL Authentication and will use this +The Apache ActiveMQ Artemis Server accepts AMQP SASL Authentication and will use this to map onto the underlying session created for the connection so you can -use the normal Apache ActiveMQ security configuration. +use the normal Apache ActiveMQ Artemis security configuration. ### AMQP Links An AMQP Link is a uni directional transport for messages between a -source and a target, i.e. a client and the Apache ActiveMQ Broker. A link will +source and a target, i.e. a client and the Apache ActiveMQ Artemis Broker. A link will have an endpoint of which there are 2 kinds, a Sender and A Receiver. At -the Broker a Sender will have its messages converted into an Apache ActiveMQ +the Broker a Sender will have its messages converted into an Apache ActiveMQ Artemis Message and forwarded to its destination or target. A Receiver will map -onto an Apache ActiveMQ Server Consumer and convert Apache ActiveMQ messages back into +onto an Apache ActiveMQ Artemis Server Consumer and convert Apache ActiveMQ Artemis messages back into AMQP messages before being delivered. ### AMQP and destinations @@ -294,27 +294,27 @@ or committed via the coordinator. > **Note** > > AMQP allows the use of multiple transactions per session, -> `amqp:multi-txns-per-ssn`, however in this version Apache ActiveMQ will only +> `amqp:multi-txns-per-ssn`, however in this version Apache ActiveMQ Artemis will only > support single transactions per session ## OpenWire -Apache ActiveMQ now supports the +Apache ActiveMQ Artemis now supports the [OpenWire](http://activemq.apache.org/openwire.html) protocol so that an -Apache ActiveMQ JMS client can talk directly to an Apache ActiveMQ server. To enable +Apache ActiveMQ Artemis JMS client can talk directly to an Apache ActiveMQ Artemis server. To enable OpenWire support you must configure a Netty Acceptor, like so: tcp://localhost:61616?protocols=OPENWIRE -The Apache ActiveMQ server will then listens on port 61616 for incoming +The Apache ActiveMQ Artemis server will then listens on port 61616 for incoming openwire commands. Please note the "protocols" is not mandatory here. -The openwire configuration conforms to Apache ActiveMQ's "Single Port" feature. +The openwire configuration conforms to Apache ActiveMQ Artemis's "Single Port" feature. Please refer to [Configuring Single Port](#configuring-transports.single-port) for details. Please refer to the openwire example for more coding details. -Currently we support Apache ActiveMQ clients that using standard JMS APIs. In -the future we will get more supports for some advanced, Apache ActiveMQ -specific features into Apache ActiveMQ. +Currently we support Apache ActiveMQ Artemis clients that using standard JMS APIs. In +the future we will get more supports for some advanced, Apache ActiveMQ Artemis +specific features into Apache ActiveMQ Artemis. diff --git a/docs/user-manual/en/jms-bridge.md b/docs/user-manual/en/jms-bridge.md index e169975e21..d966ad4203 100644 --- a/docs/user-manual/en/jms-bridge.md +++ b/docs/user-manual/en/jms-bridge.md @@ -1,6 +1,6 @@ # The JMS Bridge -Apache ActiveMQ includes a fully functional JMS message bridge. +Apache ActiveMQ Artemis includes a fully functional JMS message bridge. The function of the bridge is to consume messages from a source queue or topic, and send them to a target queue or topic, typically on a @@ -8,18 +8,18 @@ different server. > *Notice:* > The JMS Bridge is not intended as a replacement for transformation and more expert systems such as Camel. -> The JMS Bridge may be useful for fast transfers as this chapter covers, but keep in mind that more complex scenarios requiring transformations will require you to use a more advanced transformation system that will play on use cases that will go beyond Apache ActiveMQ. +> The JMS Bridge may be useful for fast transfers as this chapter covers, but keep in mind that more complex scenarios requiring transformations will require you to use a more advanced transformation system that will play on use cases that will go beyond Apache ActiveMQ Artemis. The source and target servers do not have to be in the same cluster which makes bridging suitable for reliably sending messages from one cluster to another, for instance across a WAN, and where the connection may be unreliable. -A bridge can be deployed as a standalone application, with Apache ActiveMQ +A bridge can be deployed as a standalone application, with Apache ActiveMQ Artemis standalone server or inside a JBoss AS instance. The source and the target can be located in the same virtual machine or another one. -The bridge can also be used to bridge messages from other non Apache ActiveMQ +The bridge can also be used to bridge messages from other non Apache ActiveMQ Artemis JMS servers, as long as they are JMS 1.1 compliant. > **Note** @@ -27,7 +27,7 @@ JMS servers, as long as they are JMS 1.1 compliant. > Do not confuse a JMS bridge with a core bridge. A JMS bridge can be > used to bridge any two JMS 1.1 compliant JMS providers and uses the > JMS API. A core bridge (described in [Core Bidges](core-bridges.md)) is used to bridge any two -> Apache ActiveMQ instances and uses the core API. Always use a core bridge if +> Apache ActiveMQ Artemis instances and uses the core API. Always use a core bridge if > you can in preference to a JMS bridge. The core bridge will typically > provide better performance than a JMS bridge. Also the core bridge can > provide *once and only once* delivery guarantees without using XA. @@ -193,7 +193,7 @@ by the parameters passed to its constructor. The "transactionManager" property points to a JTA transaction manager implementation and should be set if you need to use the 'ONCE_AND_ONCE_ONLY' -Quality of Service. Apache ActiveMQ doesn't ship with such an implementation, but +Quality of Service. Apache ActiveMQ Artemis doesn't ship with such an implementation, but if you are running within an Application Server you can inject the Transaction Manager that is shipped. @@ -204,7 +204,7 @@ the connection factory used to create the connection for the source or target server. The configuration example above uses the default implementation provided -by Apache ActiveMQ that looks up the connection factory using JNDI. For other +by Apache ActiveMQ Artemis that looks up the connection factory using JNDI. For other Application Servers or JMS providers a new implementation may have to be provided. This can easily be done by implementing the interface `org.apache.activemq.jms.bridge.ConnectionFactoryFactory`. @@ -215,7 +215,7 @@ Again, similarly, these are used to create or lookup up the destinations. In the configuration example above, we have used the default provided by -Apache ActiveMQ that looks up the destination using JNDI. +Apache ActiveMQ Artemis that looks up the destination using JNDI. A new implementation can be provided by implementing `org.apache.activemq.jms.bridge.DestinationFactory` interface. @@ -251,7 +251,7 @@ This mode is available for both durable and non-durable messages. This QoS mode ensures messages will reach the destination from the source once and only once. (Sometimes this mode is known as "exactly -once"). If both the source and the destination are on the same Apache ActiveMQ +once"). If both the source and the destination are on the same Apache ActiveMQ Artemis server instance then this can be achieved by sending and acknowledging the messages in the same local transaction. If the source and destination are on different servers this is achieved by enlisting the @@ -307,4 +307,4 @@ you will have to bear in mind timeout issues. Please see [the examples chapter](examples.md) which shows how to configure and use a JMS Bridge with JBoss AS to send messages to the source destination and consume them from the target destination and how to configure and use a JMS Bridge between -two standalone Apache ActiveMQ servers. +two standalone Apache ActiveMQ Artemis servers. diff --git a/docs/user-manual/en/jms-core-mapping.md b/docs/user-manual/en/jms-core-mapping.md index 40190fac10..51e87b930e 100644 --- a/docs/user-manual/en/jms-core-mapping.md +++ b/docs/user-manual/en/jms-core-mapping.md @@ -1,9 +1,9 @@ # Mapping JMS Concepts to the Core API -This chapter describes how JMS destinations are mapped to Apache ActiveMQ +This chapter describes how JMS destinations are mapped to Apache ActiveMQ Artemis addresses. -Apache ActiveMQ core is JMS-agnostic. It does not have any concept of a JMS +Apache ActiveMQ Artemis core is JMS-agnostic. It does not have any concept of a JMS topic. A JMS topic is implemented in core as an address (the topic name) with zero or more queues bound to it. Each queue bound to that address represents a topic subscription. Likewise, a JMS queue is implemented as diff --git a/docs/user-manual/en/large-messages.md b/docs/user-manual/en/large-messages.md index 373f1e48e3..b2cbe8f95f 100644 --- a/docs/user-manual/en/large-messages.md +++ b/docs/user-manual/en/large-messages.md @@ -1,6 +1,6 @@ # Large Messages -Apache ActiveMQ supports sending and receiving of huge messages, even when the +Apache ActiveMQ Artemis supports sending and receiving of huge messages, even when the client and server are running with limited memory. The only realistic limit to the size of a message that can be sent or consumed is the amount of disk space you have available. We have tested sending and @@ -8,7 +8,7 @@ consuming messages up to 8 GiB in size with a client and server running in just 50MiB of RAM! To send a large message, the user can set an `InputStream` on a message -body, and when that message is sent, Apache ActiveMQ will read the +body, and when that message is sent, Apache ActiveMQ Artemis will read the `InputStream`. A `FileInputStream` could be used for example to send a huge message from a huge file on disk. @@ -52,9 +52,9 @@ determined by the parameter `minLargeMessageSize` > **Note** > -> Apache ActiveMQ messages are encoded using 2 bytes per character so if the +> Apache ActiveMQ Artemis messages are encoded using 2 bytes per character so if the > message data is filled with ASCII characters (which are 1 byte) the -> size of the resulting Apache ActiveMQ message would roughly double. This is +> size of the resulting Apache ActiveMQ Artemis message would roughly double. This is > important when calculating the size of a "large" message as it may > appear to be less than the `minLargeMessageSize` before it is sent, > but it then turns into a "large" message once it is encoded. @@ -63,7 +63,7 @@ The default value is 100KiB. ### Using Core API -If the Apache ActiveMQ Core API is used, the minimal large message size is +If the Apache ActiveMQ Artemis Core API is used, the minimal large message size is specified by `ServerLocator.setMinLargeMessageSize`. ``` java @@ -85,7 +85,7 @@ environment, e.g. `jndi.properties`. Here's a simple example using the "ConnectionFactory" connection factory which is available in the context by default: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.myConnectionFactory=tcp://localhost:61616?minLargeMessageSize=250000 @@ -120,12 +120,12 @@ e.g. `jndi.properties`. Here's a simple example using the "ConnectionFactory" connection factory which is available in the context by default: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.myConnectionFactory=tcp://localhost:61616?compressLargeMessages=true ## Streaming large messages -Apache ActiveMQ supports setting the body of messages using input and output +Apache ActiveMQ Artemis supports setting the body of messages using input and output streams (`java.lang.io`) These streams are then used directly for sending (input streams) and @@ -213,7 +213,7 @@ _AMQ_LARGE_SIZE. ### Streaming over JMS -When using JMS, Apache ActiveMQ maps the streaming methods on the core API (see +When using JMS, Apache ActiveMQ Artemis maps the streaming methods on the core API (see ClientMessage API table above) by setting object properties . You can use the method `Message.setObjectProperty` to set the input and output streams. @@ -264,7 +264,7 @@ messageReceived.setObjectProperty("JMS_AMQ_OutputStream", bufferedOutput); ## Streaming Alternative If you choose not to use the `InputStream` or `OutputStream` capability -of Apache ActiveMQ You could still access the data directly in an alternative +of Apache ActiveMQ Artemis You could still access the data directly in an alternative fashion. On the Core API just get the bytes of the body as you normally would. diff --git a/docs/user-manual/en/libaio.md b/docs/user-manual/en/libaio.md index ddb1083259..64fbdb8d11 100644 --- a/docs/user-manual/en/libaio.md +++ b/docs/user-manual/en/libaio.md @@ -1,6 +1,6 @@ # Libaio Native Libraries -Apache ActiveMQ distributes a native library, used as a bridge between Apache ActiveMQ +Apache ActiveMQ Artemis distributes a native library, used as a bridge between Apache ActiveMQ Artemis and Linux libaio. `libaio` is a library, developed as part of the Linux kernel project. @@ -11,13 +11,13 @@ when they have been processed. We use this in our high performance journal if configured to do so, please see [Persistence](persistence.md). -These are the native libraries distributed by Apache ActiveMQ: +These are the native libraries distributed by Apache ActiveMQ Artemis: - libActiveMQAIO32.so - x86 32 bits - libActiveMQAIO64.so - x86 64 bits -When using libaio, Apache ActiveMQ will always try loading these files as long +When using libaio, Apache ActiveMQ Artemis will always try loading these files as long as they are on the [library path](#using-server.library.path). ## Compiling the native libraries @@ -65,27 +65,27 @@ Or on Debian systems: ## Invoking the compilation -In the source distribution or git clone, in the `activemq-native` directory, execute the shell +In the source distribution or git clone, in the `artemis-native` directory, execute the shell script `compile-native.sh`. This script will invoke the proper maven profile to perform the native build. - someUser@someBox:/checkout-dir/activemq-native$ ./compile-native.sh + someUser@someBox:/checkout-dir/artemis-native$ ./compile-native.sh [INFO] Scanning for projects... [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building ActiveMQ Artemis Native POM 6.0.0 [INFO] ------------------------------------------------------------------------ [INFO] - [INFO] --- nar-maven-plugin:3.0.0:nar-validate (default-nar-validate) @ activemq-native --- + [INFO] --- nar-maven-plugin:3.0.0:nar-validate (default-nar-validate) @ artemis-native --- [INFO] Using AOL: amd64-Linux-gpp [INFO] - [INFO] --- maven-enforcer-plugin:1.4:enforce (enforce-java) @ activemq-native --- + [INFO] --- maven-enforcer-plugin:1.4:enforce (enforce-java) @ artemis-native --- ... The produced library will be at -`./target/nar/activemq-native-RELEASE-amd64-Linux-gpp-jni/lib/amd64-Linux-gpp/jni/ -libactivemq-native-RELEASE.so`. Simply move that file over +`./target/nar/artemis-native-RELEASE-amd64-Linux-gpp-jni/lib/amd64-Linux-gpp/jni/ +libartemis-native-RELEASE.so`. Simply move that file over `bin` with the proper rename [library path](#using-server.library.path). -If you want to perform changes on the Apache ActiveMQ libaio code, you could +If you want to perform changes on the Apache ActiveMQ Artemis libaio code, you could just call make directly at the `native-src` directory. diff --git a/docs/user-manual/en/logging.md b/docs/user-manual/en/logging.md index cf184a4541..c39f9e2cee 100644 --- a/docs/user-manual/en/logging.md +++ b/docs/user-manual/en/logging.md @@ -1,6 +1,6 @@ # Logging -Apache ActiveMQ uses the JBoss Logging framework to do its logging and is +Apache ActiveMQ Artemis uses the JBoss Logging framework to do its logging and is configurable via the `logging.properties` file found in the configuration directories. This is configured by Default to log to both the console and to a file. @@ -21,26 +21,26 @@ There are 6 loggers available which are as follows: org.jboss.logging - Logs any calls not handled by the Apache ActiveMQ loggers + Logs any calls not handled by the Apache ActiveMQ Artemis loggers - org.apache.activemq.core.server + org.apache.activemq.artemis.core.server Logs the core server - org.apache.activemq.utils + org.apache.activemq.artemis.utils Logs utility calls - org.apache.activemq.journal + org.apache.activemq.artemis.journal Logs Journal calls - org.apache.activemq.jms + org.apache.activemq.artemis.jms Logs JMS calls - org.apache.activemq.integration.bootstrap + org.apache.activemq.artemis.integration.bootstrap Logs bootstrap calls @@ -81,14 +81,14 @@ this is done via the `-Dlogging.configuration` for instance The following is a typical `logging.properties for a client` # Root logger option - loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.utils,org.apache.activemq.journal,org.apache.activemq.jms,org.apache.activemq.ra + loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms,org.apache.activemq.artemis.ra # Root logger level logger.level=INFO - # Apache ActiveMQ logger levels - logger.org.apache.activemq.core.server.level=INFO - logger.org.apache.activemq.utils.level=INFO - logger.org.apache.activemq.jms.level=DEBUG + # Apache ActiveMQ Artemis logger levels + logger.org.apache.activemq.artemis.core.server.level=INFO + logger.org.apache.activemq.artemis.utils.level=INFO + logger.org.apache.activemq.artemis.jms.level=DEBUG # Root logger handlers logger.handlers=FILE,CONSOLE diff --git a/docs/user-manual/en/management.md b/docs/user-manual/en/management.md index ae1fed88e8..f44eff183b 100644 --- a/docs/user-manual/en/management.md +++ b/docs/user-manual/en/management.md @@ -1,23 +1,23 @@ # Management -Apache ActiveMQ has an extensive management API that allows a user to modify a +Apache ActiveMQ Artemis has an extensive management API that allows a user to modify a server configuration, create new resources (e.g. JMS queues and topics), inspect these resources (e.g. how many messages are currently held in a queue) and interact with it (e.g. to remove messages from a queue). All -the operations allows a client to *manage* Apache ActiveMQ. It also allows +the operations allows a client to *manage* Apache ActiveMQ Artemis. It also allows clients to subscribe to management notifications. -There are 3 ways to manage Apache ActiveMQ: +There are 3 ways to manage Apache ActiveMQ Artemis: - Using JMX -- JMX is the standard way to manage Java applications -- Using the core API -- management operations are sent to Apache ActiveMQ +- Using the core API -- management operations are sent to Apache ActiveMQ Artemis server using *core messages* -- Using the JMS API -- management operations are sent to Apache ActiveMQ +- Using the JMS API -- management operations are sent to Apache ActiveMQ Artemis server using *JMS messages* -Although there are 3 different ways to manage Apache ActiveMQ each API supports +Although there are 3 different ways to manage Apache ActiveMQ Artemis each API supports the same functionality. If it is possible to manage a resource using JMX it is also possible to achieve the same result using Core messages or JMS messages. @@ -33,7 +33,7 @@ API is the same. For each *managed resource*, there exists a Java interface describing what can be invoked for this type of resource. -Apache ActiveMQ exposes its managed resources in 2 packages: +Apache ActiveMQ Artemis exposes its managed resources in 2 packages: - *Core* resources are located in the `org.apache.activemq.api.core.management` package @@ -53,7 +53,7 @@ messages, or JMS messages are used. ### Core Management API -Apache ActiveMQ defines a core management API to manage core resources. For +Apache ActiveMQ Artemis defines a core management API to manage core resources. For full details of the API please consult the javadoc. In summary: #### Core Server Management @@ -113,7 +113,7 @@ full details of the API please consult the javadoc. In summary: - Retrieving the server configuration and attributes - The `ActiveMQServerControl` exposes Apache ActiveMQ server configuration + The `ActiveMQServerControl` exposes Apache ActiveMQ Artemis server configuration through all its attributes (e.g. `getVersion()` method to retrieve the server's version, etc.) @@ -235,7 +235,7 @@ messages with a given property.) #### Other Core Resources Management -Apache ActiveMQ allows to start and stop its remote resources (acceptors, +Apache ActiveMQ Artemis allows to start and stop its remote resources (acceptors, diverts, bridges, etc.) so that a server can be taken off line for a given period of time without stopping it completely (e.g. if other management operations must be performed such as resolving heuristic @@ -297,7 +297,7 @@ transactions). These resources are: ### JMS Management API -Apache ActiveMQ defines a JMS Management API to manage JMS *administrated +Apache ActiveMQ Artemis defines a JMS Management API to manage JMS *administrated objects* (i.e. JMS queues, topics and connection factories). #### JMS Server Management @@ -477,11 +477,11 @@ ObjectName `org.apache.activemq:module=JMS,type=Topic,name=" + false -If JMX is enabled, Apache ActiveMQ can be managed locally using `jconsole`. +If JMX is enabled, Apache ActiveMQ Artemis can be managed locally using `jconsole`. > **Note** > @@ -519,9 +519,9 @@ If JMX is enabled, Apache ActiveMQ can be managed locally using `jconsole`. > to configure the server for remote management (system properties must > be set in `run.sh` or `run.bat` scripts). -By default, Apache ActiveMQ server uses the JMX domain "org.apache.activemq". -To manage several Apache ActiveMQ servers from the *same* MBeanServer, the JMX -domain can be configured for each individual Apache ActiveMQ server by setting +By default, Apache ActiveMQ Artemis server uses the JMX domain "org.apache.activemq". +To manage several Apache ActiveMQ Artemis servers from the *same* MBeanServer, the JMX +domain can be configured for each individual Apache ActiveMQ Artemis server by setting `jmx-domain` in `activemq-configuration.xml`: @@ -529,14 +529,14 @@ domain can be configured for each individual Apache ActiveMQ server by setting #### MBeanServer configuration -When Apache ActiveMQ is run in standalone, it uses the Java Virtual Machine's +When Apache ActiveMQ Artemis is run in standalone, it uses the Java Virtual Machine's `Platform MBeanServer` to register its MBeans. By default [Jolokia](http://www.jolokia.org/) is also deployed to allow access to the mbean server via rest. ### Example See the [chapters](examples.md) chapter for an example which shows how to use a remote connection to JMX -and MBean proxies to manage Apache ActiveMQ. +and MBean proxies to manage Apache ActiveMQ Artemis. ### Exposing JMX using Jolokia @@ -567,7 +567,7 @@ management API: - The parameters of the management operation When such a management message is sent to the management address, -Apache ActiveMQ server will handle it, extract the information, invoke the +Apache ActiveMQ Artemis server will handle it, extract the information, invoke the operation on the managed resources and send a *management reply* to the management message's reply-to address (specified by `ClientMessageImpl.REPLYTO_HEADER_NAME`). @@ -636,7 +636,7 @@ be able to receive and handle management messages. This is also configured in activemq-configuration.xml: - + @@ -693,11 +693,11 @@ steps are the same (see Configuring Core Management section). ### Example See the [examples](examples.md) chapter for an example which shows -how to use JMS messages to manage the Apache ActiveMQ server. +how to use JMS messages to manage the Apache ActiveMQ Artemis server. ## Management Notifications -Apache ActiveMQ emits *notifications* to inform listeners of potentially +Apache ActiveMQ Artemis emits *notifications* to inform listeners of potentially interesting events (creation of new resources, security violation, etc.). @@ -722,7 +722,7 @@ subscribing to 2 MBeans: ### Core Messages Notifications -Apache ActiveMQ defines a special *management notification address*. Core +Apache ActiveMQ Artemis defines a special *management notification address*. Core queues can be bound to this address so that clients will receive management notifications as Core messages @@ -749,7 +749,7 @@ By default, the address is `activemq.notifications`. ### JMS Messages Notifications -Apache ActiveMQ's notifications can also be received using JMS messages. +Apache ActiveMQ Artemis's notifications can also be received using JMS messages. It is similar to receiving notifications using Core API but an important difference is that JMS requires a JMS Destination to receive the @@ -894,7 +894,7 @@ header. The timestamp is the un-formatted result of a call to ## Message Counters Message counters can be used to obtain information on queues *over time* -as Apache ActiveMQ keeps a history on queue metrics. +as Apache ActiveMQ Artemis keeps a history on queue metrics. They can be used to show *trends* on queues. For example, using the management API, it would be possible to query the number of messages in @@ -967,7 +967,7 @@ Message counters can be retrieved using the Management API. For example, to retrieve message counters on a JMS Queue using JMX: ``` java -// retrieve a connection to Apache ActiveMQ's MBeanServer +// retrieve a connection to Apache ActiveMQ Artemis's MBeanServer MBeanServerConnection mbsc = ... JMSQueueControlMBean queueControl = (JMSQueueControl)MBeanServerInvocationHandler.newProxyInstance(mbsc, on, diff --git a/docs/user-manual/en/message-expiry.md b/docs/user-manual/en/message-expiry.md index b1707eb560..61d3d94594 100644 --- a/docs/user-manual/en/message-expiry.md +++ b/docs/user-manual/en/message-expiry.md @@ -2,18 +2,18 @@ Messages can be set with an optional *time to live* when sending them. -Apache ActiveMQ will not deliver a message to a consumer after it's time to +Apache ActiveMQ Artemis will not deliver a message to a consumer after it's time to live has been exceeded. If the message hasn't been delivered by the time that time to live is reached the server can discard it. -Apache ActiveMQ's addresses can be assigned a expiry address so that, when +Apache ActiveMQ Artemis's addresses can be assigned a expiry address so that, when messages are expired, they are removed from the queue and sent to the expiry address. Many different queues can be bound to an expiry address. These *expired* messages can later be consumed for further inspection. ## Message Expiry -Using Apache ActiveMQ Core API, you can set an expiration time directly on the +Using Apache ActiveMQ Artemis Core API, you can set an expiration time directly on the message: // message will expire in 5000ms from now diff --git a/docs/user-manual/en/message-grouping.md b/docs/user-manual/en/message-grouping.md index 40b683e8c3..cf520fb662 100644 --- a/docs/user-manual/en/message-grouping.md +++ b/docs/user-manual/en/message-grouping.md @@ -5,7 +5,7 @@ characteristics: - Messages in a message group share the same group id, i.e. they have same group identifier property (`JMSXGroupID` for JMS, - `_AMQ_GROUP_ID` for Apache ActiveMQ Core API). + `_AMQ_GROUP_ID` for Apache ActiveMQ Artemis Core API). - Messages in a message group are always consumed by the same consumer, even if there are many consumers on a queue. They pin all @@ -67,7 +67,7 @@ also be set in the JNDI context environment, e.g. `jndi.properties`. Here's a simple example using the "ConnectionFactory" connection factory which is available in the context by default - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.myConnectionFactory=tcp://localhost:61616?autoGroup=true Alternatively you can set the group id via the connection factory. All @@ -77,7 +77,7 @@ can also be set in the JNDI context environment, e.g. `jndi.properties`. Here's a simple example using the "ConnectionFactory" connection factory which is available in the context by default: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.myConnectionFactory=tcp://localhost:61616?roupID=Group-0 ## Example diff --git a/docs/user-manual/en/messaging-concepts.md b/docs/user-manual/en/messaging-concepts.md index 40bf8611fe..49f9440e1a 100644 --- a/docs/user-manual/en/messaging-concepts.md +++ b/docs/user-manual/en/messaging-concepts.md @@ -1,6 +1,6 @@ # Messaging Concepts -Apache ActiveMQ is an asynchronous messaging system, an example of [Message +Apache ActiveMQ Artemis is an asynchronous messaging system, an example of [Message Oriented Middleware](http://en.wikipedia.org/wiki/Message_oriented_middleware) , we'll just call them messaging systems in the remainder of this book. @@ -140,7 +140,7 @@ require. ## Transactions Messaging systems typically support the sending and acknowledgement of -multiple messages in a single local transaction. Apache ActiveMQ also supports +multiple messages in a single local transaction. Apache ActiveMQ Artemis also supports the sending and acknowledgement of message as part of a large global transaction - using the Java mapping of XA: JTA. @@ -184,7 +184,7 @@ programmatic API so JMS clients and servers from different vendors cannot directly interoperate since each will use the vendor's own internal wire protocol. -Apache ActiveMQ provides a fully compliant JMS 1.1 and JMS 2.0 API. +Apache ActiveMQ Artemis provides a fully compliant JMS 1.1 and JMS 2.0 API. ### System specific APIs @@ -194,7 +194,7 @@ of system functionality to be exposed to the client application. API's like JMS are not normally rich enough to expose all the extra features that most messaging systems provide. -Apache ActiveMQ provides its own core client API for clients to use if they +Apache ActiveMQ Artemis provides its own core client API for clients to use if they wish to have access to functionality over and above that accessible via the JMS API. @@ -216,7 +216,7 @@ use HTTP as their underlying protocol. The advantage of a REST approach with HTTP is in its simplicity and the fact the internet is already tuned to deal with HTTP optimally. -Please see [Rest Interface](rest.md) for using Apache ActiveMQ's RESTful interface. +Please see [Rest Interface](rest.md) for using Apache ActiveMQ Artemis's RESTful interface. ### STOMP @@ -226,7 +226,7 @@ theoretically any Stomp client can work with any messaging system that supports Stomp. Stomp clients are available in many different programming languages. -Please see [Stomp](interoperability.md) for using STOMP with Apache ActiveMQ. +Please see [Stomp](interoperability.md) for using STOMP with Apache ActiveMQ Artemis. ### AMQP @@ -235,10 +235,10 @@ interoperable messaging. It also defines a wire format, so any AMQP client can work with any messaging system that supports AMQP. AMQP clients are available in many different programming languages. -Apache ActiveMQ implements the [AMQP +Apache ActiveMQ Artemis implements the [AMQP 1.0](https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=amqp) specification. Any client that supports the 1.0 specification will be -able to interact with Apache ActiveMQ. +able to interact with Apache ActiveMQ Artemis. ## High Availability @@ -246,7 +246,7 @@ High Availability (HA) means that the system should remain operational after failure of one or more of the servers. The degree of support for HA varies between various messaging systems. -Apache ActiveMQ provides automatic failover where your sessions are +Apache ActiveMQ Artemis provides automatic failover where your sessions are automatically reconnected to the backup server on event of live server failure. @@ -263,12 +263,12 @@ Degrees of support for clusters varies between messaging systems, with some systems having fairly basic clusters with the cluster members being hardly aware of each other. -Apache ActiveMQ provides very configurable state-of-the-art clustering model +Apache ActiveMQ Artemis provides very configurable state-of-the-art clustering model where messages can be intelligently load balanced between the servers in the cluster, according to the number of consumers on each node, and whether they are ready for messages. -Apache ActiveMQ also has the ability to automatically redistribute messages +Apache ActiveMQ Artemis also has the ability to automatically redistribute messages between nodes of a cluster to prevent starvation on any particular node. For full details on clustering, please see [Clusters](clusters.md). @@ -284,10 +284,10 @@ messages to another queue on a different server. Bridges cope with unreliable connections, automatically reconnecting when the connections becomes available again. -Apache ActiveMQ bridges can be configured with filter expressions to only +Apache ActiveMQ Artemis bridges can be configured with filter expressions to only forward certain messages, and transformation can also be hooked in. -Apache ActiveMQ also allows routing between queues to be configured in server +Apache ActiveMQ Artemis also allows routing between queues to be configured in server side configuration. This allows complex routing networks to be set up forwarding or copying messages from one destination to another, forming a global network of interconnected brokers. diff --git a/docs/user-manual/en/paging.md b/docs/user-manual/en/paging.md index 09e46955e1..d6c5171c3b 100644 --- a/docs/user-manual/en/paging.md +++ b/docs/user-manual/en/paging.md @@ -1,17 +1,17 @@ # Paging -Apache ActiveMQ transparently supports huge queues containing millions of +Apache ActiveMQ Artemis transparently supports huge queues containing millions of messages while the server is running with limited memory. In such a situation it's not possible to store all of the queues in -memory at any one time, so Apache ActiveMQ transparently *pages* messages into +memory at any one time, so Apache ActiveMQ Artemis transparently *pages* messages into and out of memory as they are needed, thus allowing massive queues with a low memory footprint. -Apache ActiveMQ will start paging messages to disk, when the size of all +Apache ActiveMQ Artemis will start paging messages to disk, when the size of all messages in memory for an address exceeds a configured maximum size. -By default, Apache ActiveMQ does not page messages - this must be explicitly +By default, Apache ActiveMQ Artemis does not page messages - this must be explicitly configured to activate it. ## Page Files @@ -52,7 +52,7 @@ Global paging parameters are specified on the main configuration file Property Name Description Default -------------------- --------------------------------------------------------------------------------------------------------------------------- ------------- - `paging-directory` Where page files are stored. Apache ActiveMQ will create one folder for each address being paged under this configured location. data/paging + `paging-directory` Where page files are stored. Apache ActiveMQ Artemis will create one folder for each address being paged under this configured location. data/paging : Paging Configuration Parameters @@ -183,4 +183,4 @@ undesirable state. ## Example -See the [examples](examples.md) chapter for an example which shows how to use paging with Apache ActiveMQ. +See the [examples](examples.md) chapter for an example which shows how to use paging with Apache ActiveMQ Artemis. diff --git a/docs/user-manual/en/perf-tuning.md b/docs/user-manual/en/perf-tuning.md index 81132b1e38..14d1960587 100644 --- a/docs/user-manual/en/perf-tuning.md +++ b/docs/user-manual/en/perf-tuning.md @@ -1,6 +1,6 @@ # Performance Tuning -In this chapter we'll discuss how to tune Apache ActiveMQ for optimum +In this chapter we'll discuss how to tune Apache ActiveMQ Artemis for optimum performance. ## Tuning persistence @@ -72,12 +72,12 @@ JMS API storage. - Batch many sends or acknowledgements in a single transaction. - Apache ActiveMQ will only require a network round trip on the commit, not + Apache ActiveMQ Artemis will only require a network round trip on the commit, not on every send or acknowledgement. ## Other Tunings -There are various other places in Apache ActiveMQ where we can perform some +There are various other places in Apache ActiveMQ Artemis where we can perform some tuning: - Use Asynchronous Send Acknowledgements. If you need to send durable @@ -125,7 +125,7 @@ tuning: consumer-window-size. This effectively disables consumer flow control. -- Socket NIO vs Socket Old IO. By default Apache ActiveMQ uses old (blocking) +- Socket NIO vs Socket Old IO. By default Apache ActiveMQ Artemis uses old (blocking) on the server and the client side (see the chapter on configuring transports for more information [Configuring the Transport](configuring-transports.md). NIO is much more scalable but can give you some latency hit compared to old blocking IO. If you @@ -174,7 +174,7 @@ tuning: `serveruser`. - Use `batch-delay` and set `direct-deliver` to false for the best - throughput for very small messages. Apache ActiveMQ comes with a + throughput for very small messages. Apache ActiveMQ Artemis comes with a preconfigured connector/acceptor pair (`netty-throughput`) in `activemq-configuration.xml` and JMS connection factory (`ThroughputConnectionFactory`) in `activemq-jms.xml`which can be @@ -193,7 +193,7 @@ tunings won't apply to JDKs from other providers (e.g. IBM or JRockit) `-XX:+UseParallelOldGC` on Sun JDKs. - Memory settings. Give as much memory as you can to the server. - Apache ActiveMQ can run in low memory by using paging (described in [Paging](paging.md)) but + Apache ActiveMQ Artemis can run in low memory by using paging (described in [Paging](paging.md)) but if it can run with all queues in RAM this will improve performance. The amount of memory you require will depend on the size and number of your queues and the size and number of your messages. Use the JVM @@ -223,7 +223,7 @@ tunings won't apply to JDKs from other providers (e.g. IBM or JRockit) > Some popular libraries such as the Spring JMS Template are known > to use these anti-patterns. If you're using Spring JMS Template > and you're getting poor performance you know why. Don't blame - > Apache ActiveMQ! The Spring JMS Template can only safely be used in an + > Apache ActiveMQ Artemis! The Spring JMS Template can only safely be used in an > app server which caches JMS sessions (e.g. using JCA), and only > then for sending messages. It cannot be safely be used for > synchronously consuming messages, even in an app server. diff --git a/docs/user-manual/en/persistence.md b/docs/user-manual/en/persistence.md index 517d2436df..e6f59f5da2 100644 --- a/docs/user-manual/en/persistence.md +++ b/docs/user-manual/en/persistence.md @@ -1,14 +1,14 @@ # Persistence -In this chapter we will describe how persistence works with Apache ActiveMQ and +In this chapter we will describe how persistence works with Apache ActiveMQ Artemis and how to configure it. -Apache ActiveMQ ships with a high performance journal. Since Apache ActiveMQ handles +Apache ActiveMQ Artemis ships with a high performance journal. Since Apache ActiveMQ Artemis handles its own persistence, rather than relying on a database or other 3rd party persistence engine it is very highly optimised for the specific messaging use cases. -An Apache ActiveMQ journal is an *append only* journal. It consists of a set of +An Apache ActiveMQ Artemis journal is an *append only* journal. It consists of a set of files on disk. Each file is pre-created to a fixed size and initially filled with padding. As operations are performed on the server, e.g. add message, update message, delete message, records are appended to the @@ -27,12 +27,12 @@ minimise the amount of disk head movement, since an entire disk cylinder is accessible simply by the disk rotating - the head does not have to move. -As delete records are added to the journal, Apache ActiveMQ has a sophisticated +As delete records are added to the journal, Apache ActiveMQ Artemis has a sophisticated file garbage collection algorithm which can determine if a particular journal file is needed any more - i.e. has all its data been deleted in the same or other files. If so, the file can be reclaimed and re-used. -Apache ActiveMQ also has a compaction algorithm which removes dead space from +Apache ActiveMQ Artemis also has a compaction algorithm which removes dead space from the journal and compresses up the data so it takes up less files on disk. @@ -41,7 +41,7 @@ supporting both local and XA transactions. The majority of the journal is written in Java, however we abstract out the interaction with the actual file system to allow different pluggable -implementations. Apache ActiveMQ ships with two implementations: +implementations. Apache ActiveMQ Artemis ships with two implementations: - Java [NIO](http://en.wikipedia.org/wiki/New_I/O). @@ -52,7 +52,7 @@ implementations. Apache ActiveMQ ships with two implementations: - Linux Asynchronous IO The second implementation uses a thin native code wrapper to talk to - the Linux asynchronous IO library (AIO). With AIO, Apache ActiveMQ will be + the Linux asynchronous IO library (AIO). With AIO, Apache ActiveMQ Artemis will be called back when the data has made it to disk, allowing us to avoid explicit syncs altogether and simply send back confirmation of completion when AIO informs us that the data has been persisted. @@ -73,7 +73,7 @@ implementations. Apache ActiveMQ ships with two implementations: libaio is part of the kernel project. -The standard Apache ActiveMQ core server uses two instances of the journal: +The standard Apache ActiveMQ Artemis core server uses two instances of the journal: - Bindings journal. @@ -107,7 +107,7 @@ The standard Apache ActiveMQ core server uses two instances of the journal: This journal instance stores all message related data, including the message themselves and also duplicate-id caches. - By default Apache ActiveMQ will try and use an AIO journal. If AIO is not + By default Apache ActiveMQ Artemis will try and use an AIO journal. If AIO is not available, e.g. the platform is not Linux with the correct kernel version or AIO has not been installed then it will automatically fall back to using Java NIO which is available on any Java platform. @@ -116,13 +116,13 @@ The standard Apache ActiveMQ core server uses two instances of the journal: has a `amq` extension. File size is by the default `10485760` (configurable), and it is located at the journal folder. -For large messages, Apache ActiveMQ persists them outside the message journal. +For large messages, Apache ActiveMQ Artemis persists them outside the message journal. This is discussed in [Large Messages](large-messages.md). -Apache ActiveMQ can also be configured to page messages to disk in low memory +Apache ActiveMQ Artemis can also be configured to page messages to disk in low memory situations. This is discussed in [Paging](paging.md). -If no persistence is required at all, Apache ActiveMQ can also be configured +If no persistence is required at all, Apache ActiveMQ Artemis can also be configured not to persist any data at all to storage as discussed in the Configuring the broker for Zero Persistence section. @@ -182,18 +182,18 @@ The message journal is configured using the following attributes in Choosing `NIO` chooses the Java NIO journal. Choosing `AIO` chooses the Linux asynchronous IO journal. If you choose `AIO` but are not - running Linux or you do not have libaio installed then Apache ActiveMQ will + running Linux or you do not have libaio installed then Apache ActiveMQ Artemis will detect this and automatically fall back to using `NIO`. - `journal-sync-transactional` - If this is set to true then Apache ActiveMQ will make sure all transaction + If this is set to true then Apache ActiveMQ Artemis will make sure all transaction data is flushed to disk on transaction boundaries (commit, prepare and rollback). The default value is `true`. - `journal-sync-non-transactional` - If this is set to true then Apache ActiveMQ will make sure non + If this is set to true then Apache ActiveMQ Artemis will make sure non transactional message data (sends and acknowledgements) are flushed to disk each time. The default value for this is `true`. @@ -204,8 +204,8 @@ The message journal is configured using the following attributes in - `journal-min-files` - The minimum number of files the journal will maintain. When Apache ActiveMQ - starts and there is no initial message data, Apache ActiveMQ will + The minimum number of files the journal will maintain. When Apache ActiveMQ Artemis + starts and there is no initial message data, Apache ActiveMQ Artemis will pre-create `journal-min-files` number of files. Creating journal files and filling them with padding is a fairly @@ -327,7 +327,7 @@ The message journal is configured using the following attributes in ## Installing AIO The Java NIO journal gives great performance, but If you are running -Apache ActiveMQ using Linux Kernel 2.6 or later, we highly recommend you use +Apache ActiveMQ Artemis using Linux Kernel 2.6 or later, we highly recommend you use the `AIO` journal for the very best persistence performance. It's not possible to use the AIO journal under other operating systems @@ -344,10 +344,10 @@ Using aptitude, (e.g. on Ubuntu or Debian system): apt-get install libaio -## Configuring Apache ActiveMQ for Zero Persistence +## Configuring Apache ActiveMQ Artemis for Zero Persistence In some situations, zero persistence is sometimes required for a -messaging system. Configuring Apache ActiveMQ to perform zero persistence is +messaging system. Configuring Apache ActiveMQ Artemis to perform zero persistence is straightforward. Simply set the parameter `persistence-enabled` in `activemq-configuration.xml` to `false`. @@ -358,7 +358,7 @@ message data, duplicate id caches or paging data will be persisted. ## Import/Export the Journal Data You may want to inspect the existent records on each one of the journals -used by Apache ActiveMQ, and you can use the export/import tool for that +used by Apache ActiveMQ Artemis, and you can use the export/import tool for that purpose. you can export the journal as a text file by using this command: diff --git a/docs/user-manual/en/pre-acknowledge.md b/docs/user-manual/en/pre-acknowledge.md index 8ecf8e17a4..a0daada710 100644 --- a/docs/user-manual/en/pre-acknowledge.md +++ b/docs/user-manual/en/pre-acknowledge.md @@ -8,14 +8,14 @@ JMS specifies 3 acknowledgement modes: - `DUPS_OK_ACKNOWLEDGE` -Apache ActiveMQ supports two additional modes: `PRE_ACKNOWLEDGE` and +Apache ActiveMQ Artemis supports two additional modes: `PRE_ACKNOWLEDGE` and `INDIVIDUAL_ACKNOWLEDGE` In some cases you can afford to lose messages in event of failure, so it would make sense to acknowledge the message on the server *before* delivering it to the client. -This extra mode is supported by Apache ActiveMQ and will call it +This extra mode is supported by Apache ActiveMQ Artemis and will call it *pre-acknowledge* mode. The disadvantage of acknowledging on the server before delivery is that @@ -45,7 +45,7 @@ arrive soon, overriding the previous price. This can be configured in a client's JNDI context environment, e.g. `jndi.properties`, like this: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connection.ConnectionFactory=tcp://localhost:61616?preAcknowledge=true Alternatively, to use pre-acknowledgement mode using the JMS API, create diff --git a/docs/user-manual/en/preface.md b/docs/user-manual/en/preface.md index 1efdcda278..21c05b0ea2 100644 --- a/docs/user-manual/en/preface.md +++ b/docs/user-manual/en/preface.md @@ -1,24 +1,24 @@ # Preface -What is Apache ActiveMQ? +What is Apache ActiveMQ Artemis? -- Apache ActiveMQ is an open source project to build a multi-protocol, +- Apache ActiveMQ Artemis is an open source project to build a multi-protocol, embeddable, very high performance, clustered, asynchronous messaging system. -- Apache ActiveMQ is an example of Message Oriented Middleware (MoM). For a +- Apache ActiveMQ Artemis is an example of Message Oriented Middleware (MoM). For a description of MoMs and other messaging concepts please see the [Messaging Concepts](messaging-concepts.md). -- For answers to more questions about what Apache ActiveMQ is and what it +- For answers to more questions about what Apache ActiveMQ Artemis is and what it isn't please visit the [FAQs wiki page](todo). -Why use Apache ActiveMQ? Here are just a few of the reasons: +Why use Apache ActiveMQ Artemis? Here are just a few of the reasons: -- 100% open source software. Apache ActiveMQ is licensed using the Apache +- 100% open source software. Apache ActiveMQ Artemis is licensed using the Apache Software License v 2.0 to minimise barriers to adoption. -- Apache ActiveMQ is designed with usability in mind. +- Apache ActiveMQ Artemis is designed with usability in mind. - Written in Java. Runs on any platform with a Java 8+ runtime, that's everything from Windows desktops to IBM mainframes. diff --git a/docs/user-manual/en/project-info.md b/docs/user-manual/en/project-info.md index b602892ff0..4d8c9eb101 100644 --- a/docs/user-manual/en/project-info.md +++ b/docs/user-manual/en/project-info.md @@ -1,6 +1,6 @@ # Project Information -The official Apache ActiveMQ project page is . +The official Apache ActiveMQ Artemis project page is . ## Software Download @@ -20,11 +20,11 @@ page: - Follow us on [twitter](https://twitter.com/activemq) -- Apache ActiveMQ Git repository is +- Apache ActiveMQ Artemis Git repository is - All release tags are available from And many thanks to all our contributors, both old and new who helped -create Apache ActiveMQ. +create Apache ActiveMQ Artemis. diff --git a/docs/user-manual/en/rest.md b/docs/user-manual/en/rest.md index 5ed57340e5..a8a990d571 100644 --- a/docs/user-manual/en/rest.md +++ b/docs/user-manual/en/rest.md @@ -1,7 +1,7 @@ # REST Interface -The Apache ActiveMQ REST interface allows you to leverage the reliability and -scalability features of Apache ActiveMQ over a simple REST/HTTP interface. +The Apache ActiveMQ Artemis REST interface allows you to leverage the reliability and +scalability features of Apache ActiveMQ Artemis over a simple REST/HTTP interface. Messages are produced and consumed by sending and receiving simple HTTP messages that contain the content you want to push around. For instance, here's a simple example of posting an order to an order processing queue @@ -18,47 +18,47 @@ express as an HTTP message: As you can see, we're just posting some arbitrary XML document to a URL. -When the XML is received on the server is it processed within Apache ActiveMQ -as a JMS message and distributed through core Apache ActiveMQ. Simple and easy. +When the XML is received on the server is it processed within Apache ActiveMQ Artemis +as a JMS message and distributed through core Apache ActiveMQ Artemis. Simple and easy. Consuming messages from a queue or topic looks very similar. We'll discuss the entire interface in detail later in this docbook. ## Goals of REST Interface -Why would you want to use Apache ActiveMQ's REST interface? What are the goals +Why would you want to use Apache ActiveMQ Artemis's REST interface? What are the goals of the REST interface? - Easily usable by machine-based (code) clients. -- Zero client footprint. We want Apache ActiveMQ to be usable by any +- Zero client footprint. We want Apache ActiveMQ Artemis to be usable by any client/programming language that has an adequate HTTP client library. You shouldn't have to download, install, and configure a - special library to interact with Apache ActiveMQ. + special library to interact with Apache ActiveMQ Artemis. - Lightweight interoperability. The HTTP protocol is strong enough to be our message exchange protocol. Since interactions are RESTful the HTTP uniform interface provides all the interoperability you need to communicate between different languages, platforms, and even messaging implementations that choose to implement the same RESTful - interface as Apache ActiveMQ (i.e. the [REST-\*](http://rest-star.org) + interface as Apache ActiveMQ Artemis (i.e. the [REST-\*](http://rest-star.org) effort.) - No envelope (e.g. SOAP) or feed (e.g. Atom) format requirements. You shouldn't have to learn, use, or parse a specific XML document - format in order to send and receive messages through Apache ActiveMQ's REST + format in order to send and receive messages through Apache ActiveMQ Artemis's REST interface. - Leverage the reliability, scalability, and clustering features of - Apache ActiveMQ on the back end without sacrificing the simplicity of a + Apache ActiveMQ Artemis on the back end without sacrificing the simplicity of a REST interface. ## Installation and Configuration -Apache ActiveMQ's REST interface is installed as a Web archive (WAR). It depends on the [RESTEasy](http://jboss.org/resteasy) project and can currently only run within a servlet container. Installing the Apache ActiveMQ REST interface is a little bit different depending whether Apache ActiveMQ is already installed and configured for your environment (e.g. you're deploying within Wildfly) or you want the ActiveMQ REST WAR to startup and manage the Apache ActiveMQ server (e.g. you're deploying within something like Apache Tomcat). +Apache ActiveMQ Artemis's REST interface is installed as a Web archive (WAR). It depends on the [RESTEasy](http://jboss.org/resteasy) project and can currently only run within a servlet container. Installing the Apache ActiveMQ Artemis REST interface is a little bit different depending whether Apache ActiveMQ Artemis is already installed and configured for your environment (e.g. you're deploying within Wildfly) or you want the ActiveMQ REST WAR to startup and manage the Apache ActiveMQ Artemis server (e.g. you're deploying within something like Apache Tomcat). ### Installing Within Pre-configured Environment -This section should be used when you want to use the Apache ActiveMQ REST interface in an environment that already has Apache ActiveMQ installed and running, e.g. the Wildfly application server. You must create a Web archive (.WAR) file with the following web.xml settings: +This section should be used when you want to use the Apache ActiveMQ Artemis REST interface in an environment that already has Apache ActiveMQ Artemis installed and running, e.g. the Wildfly application server. You must create a Web archive (.WAR) file with the following web.xml settings: @@ -86,7 +86,7 @@ This section should be used when you want to use the Apache ActiveMQ REST interf -Within your WEB-INF/lib directory you must have the Apache activemq-rest.jar file. If RESTEasy is not installed within your environment, you must add the RESTEasy jar files within the lib directory as well. Here's a sample Maven pom.xml that can build a WAR with the Apache ActiveMQ REST library. +Within your WEB-INF/lib directory you must have the Apache ActiveMQ Artemis-rest.jar file. If RESTEasy is not installed within your environment, you must add the RESTEasy jar files within the lib directory as well. Here's a sample Maven pom.xml that can build a WAR with the Apache ActiveMQ Artemis REST library. @@ -162,7 +162,7 @@ You can bootstrap Apache ActiveMQ within your WAR as well. To do this, you must -Here's a Maven pom.xml file for creating a WAR for this environment. Make sure your Apache ActiveMQ configuration file(s) are within the src/main/resources directory so that they are stuffed within the WAR's WEB-INF/classes directory! +Here's a Maven pom.xml file for creating a WAR for this environment. Make sure your Apache ActiveMQ Artemis configuration file(s) are within the src/main/resources directory so that they are stuffed within the WAR's WEB-INF/classes directory! **Note** > @@ -450,10 +450,10 @@ Sometimes you might have network problems when posting new messages to a queue or topic. You may do a POST and never receive a response. Unfortunately, you don't know whether or not the server received the message and so a re-post of the message might cause duplicates to be -posted to the queue or topic. By default, the Apache ActiveMQ REST interface is +posted to the queue or topic. By default, the Apache ActiveMQ Artemis REST interface is configured to accept and post duplicate messages. You can change this by turning on duplicate message detection by setting the `dups-ok` config -option to `false` as described in [Apache ActiveMQ REST Interface +option to `false` as described in [Apache ActiveMQ Artemis REST Interface Basics](#basics). When you do this, the initial POST to the `msg-create` URL will redirect you, using the standard HTTP 307 redirection mechanism to a unique URL to POST to. All other interactions remain the same as @@ -531,17 +531,17 @@ discussed earlier. Here's an example: in the `msg-create-next` header. How can this work? As you can see, with each successful response, the -Apache ActiveMQ REST server returns a uniquely generated URL within the +Apache ActiveMQ Artemis REST server returns a uniquely generated URL within the msg-create-next header. This URL is dedicated to the next new message you want to post. Behind the scenes, the code extracts an identify from -the URL and uses Apache ActiveMQ's duplicate detection mechanism by setting the +the URL and uses Apache ActiveMQ Artemis's duplicate detection mechanism by setting the `DUPLICATE_DETECTION_ID` property of the JMS message that is actually posted to the system. If you happen to use the same ID more than once you'll see a message like this on the server: - WARN [org.apache.activemq.core.server] (Thread-3 (Apache ActiveMQ-remoting-threads-ActiveMQServerImpl::serverUUID=8d6be6f8-5e8b-11e2-80db-51bbde66f473-26319292-267207)) AMQ112098: Duplicate message detected - message will not be routed. Message information: + WARN [org.apache.activemq.artemis.core.server] (Thread-3 (Apache ActiveMQ Artemis-remoting-threads-ActiveMQServerImpl::serverUUID=8d6be6f8-5e8b-11e2-80db-51bbde66f473-26319292-267207)) AMQ112098: Duplicate message detected - message will not be routed. Message information: ServerMessage[messageID=20,priority=4, bodySize=1500,expiration=0, durable=true, address=jms.queue.bar,properties=TypedProperties[{http_content$type=application/x-www-form-urlencoded, http_content$length=3, postedAsHttpMessage=true, _AMQ_DUPL_ID=42}]]@12835058 An alternative to this approach is to use the `msg-create-with-id` @@ -568,7 +568,7 @@ repost the message. It also only has to come up with a unique ### Persistent Messages By default, posted messages are not durable and will not be persisted in -Apache ActiveMQ's journal. You can create durable messages by modifying the +Apache ActiveMQ Artemis's journal. You can create durable messages by modifying the default configuration as expressed in Chapter 2 so that all messages are persisted when sent. Alternatively, you can set a URL query parameter called `durable` to true when you post your messages to the URLs @@ -615,14 +615,14 @@ almost identically for queues and topics with some minor, but important caveats. To start consuming you must create a consumer resource on the server that is dedicated to your client. Now, this pretty much breaks the stateless principle of REST, but after much prototyping, this is the -best way to work most effectively with Apache ActiveMQ through a REST +best way to work most effectively with Apache ActiveMQ Artemis through a REST interface. You create consumer resources by doing a simple POST to the URL published by the `msg-pull-consumers` response header if you are interacting with a queue, the `msg-pull-subscribers` response header if you're interacting with a topic. These headers are provided by the main -queue or topic resource discussed in [Apache ActiveMQ REST Interface +queue or topic resource discussed in [Apache ActiveMQ Artemis REST Interface Basics](#basics). Doing an empty POST to one of these URLs will create a consumer resource that follows an auto-acknowledge protocol and, if you are interacting with a topic, creates a temporarily subscription to the @@ -642,7 +642,7 @@ parameters (`application/x-www-form-urlencoded`) described below. provide this parameter, the name will be automatically generated by the server. Only usable on topics. -- `selector`. This is an optional JMS selector string. The Apache ActiveMQ +- `selector`. This is an optional JMS selector string. The Apache ActiveMQ Artemis REST interface adds HTTP headers to the JMS message for REST produced messages. HTTP headers are prefixed with "http\_" and every '-' character is converted to a '\$'. @@ -810,7 +810,7 @@ resource. retry a post. Also notice, that another new msg-consume-next URL is present. Although it probably is the same URL you used last post, get in the habit of using URLs returned in response headers as - future versions of Apache ActiveMQ REST might be redirecting you or adding + future versions of Apache ActiveMQ Artemis REST might be redirecting you or adding additional data to the URL after timeouts like this. 3. POST to the URL within the last `msg-consume-next` to get the next @@ -1063,7 +1063,7 @@ request on the consumer resource. Unless your queue or topic has a high rate of message flowing though it, if you use the pull protocol, you're going to be receiving a lot of 503 responses as you continuously pull the server for new messages. To -alleviate this problem, the Apache ActiveMQ REST interface provides the +alleviate this problem, the Apache ActiveMQ Artemis REST interface provides the `Accept-Wait` header. This is a generic HTTP request header that is a hint to the server for how long the client is willing to wait for a response from the server. The value of this header is the time in @@ -1098,9 +1098,9 @@ server-side consumer resource (and underlying JMS session). ## Pushing Messages -You can configure the Apache ActiveMQ REST server to push messages to a +You can configure the Apache ActiveMQ Artemis REST server to push messages to a registered URL either remotely through the REST interface, or by -creating a pre-configured XML file for the Apache ActiveMQ REST server to load +creating a pre-configured XML file for the Apache ActiveMQ Artemis REST server to load at boot time. ### The Queue Push Subscription XML @@ -1145,7 +1145,7 @@ performing a retry. The `disableOnFailure` element, if set to true, will disable the registration if all retries have failed. It will not disable the connection on non-connection-failure issues (like a bad request for -instance). In these cases, the dead letter queue logic of Apache ActiveMQ will +instance). In these cases, the dead letter queue logic of Apache ActiveMQ Artemis will take over. The `link` element specifies the basis of the interaction. The `href` @@ -1158,10 +1158,10 @@ important and the value of it triggers different behavior. Here's the values a rel attribute can have: - `destination`. The href URL is assumed to be a queue or topic - resource of another Apache ActiveMQ REST server. The push registration will + resource of another Apache ActiveMQ Artemis REST server. The push registration will initially do a HEAD request to this URL to obtain a msg-create-with-id header. It will use this header to push new - messages to the Apache ActiveMQ REST endpoint reliably. Here's an example: + messages to the Apache ActiveMQ Artemis REST endpoint reliably. Here's an example: @@ -1368,19 +1368,19 @@ Here's what creating a topic would look like: HTTP/1.1 201 Created Location: http://example.com/topics/jms.topic.testTopic -## Securing the Apache ActiveMQ REST Interface +## Securing the Apache ActiveMQ Artemis REST Interface ### Within Wildfly Application server -Securing the Apache ActiveMQ REST interface is very simple with the Wildfly +Securing the Apache ActiveMQ Artemis REST interface is very simple with the Wildfly Application Server. You turn on authentication for all URLs within your -WAR's web.xml, and let the user Principal to propagate to Apache ActiveMQ. This -only works if you are using the JAASSecurityManager with Apache ActiveMQ. See -the Apache ActiveMQ documentation for more details. +WAR's web.xml, and let the user Principal to propagate to Apache ActiveMQ Artemis. This +only works if you are using the JAASSecurityManager with Apache ActiveMQ Artemis. See +the Apache ActiveMQ Artemis documentation for more details. ### Security in other environments -To secure the Apache ActiveMQ REST interface in other environments you must +To secure the Apache ActiveMQ Artemis REST interface in other environments you must role your own security by specifying security constraints with your web.xml for every path of every queue and topic you have deployed. Here is a list of URI patterns: @@ -1399,7 +1399,7 @@ Post | Description ## Mixing JMS and REST -The Apache ActiveMQ REST interface supports mixing JMS and REST producers and +The Apache ActiveMQ Artemis REST interface supports mixing JMS and REST producers and consumers. You can send an ObjectMessage through a JMS Producer, and have a REST client consume it. You can have a REST client POST a message to a topic and have a JMS Consumer receive it. Some simple @@ -1408,10 +1408,10 @@ installed. ### JMS Producers - REST Consumers -If you have a JMS producer, the Apache ActiveMQ REST interface only supports +If you have a JMS producer, the Apache ActiveMQ Artemis REST interface only supports ObjectMessage type. If the JMS producer is aware that there may be REST consumers, it should set a JMS property to specify what Content-Type the -Java object should be translated into by REST clients. The Apache ActiveMQ REST +Java object should be translated into by REST clients. The Apache ActiveMQ Artemis REST server will use RESTEasy content handlers (MessageBodyReader/Writers) to transform the Java object to the type desired. Here's an example of a JMS producer setting the content type of the message. @@ -1429,7 +1429,7 @@ push registration should be set to the desired type. ### REST Producers - JMS Consumers If you have a REST client producing messages and a JMS consumer, -Apache ActiveMQ REST has a simple helper class for you to transform the HTTP +Apache ActiveMQ Artemis REST has a simple helper class for you to transform the HTTP body to a Java object. Here's some example code: ```java diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md index 8141d15658..4fffa5d111 100644 --- a/docs/user-manual/en/security.md +++ b/docs/user-manual/en/security.md @@ -1,6 +1,6 @@ # Security -This chapter describes how security works with Apache ActiveMQ and how you can +This chapter describes how security works with Apache ActiveMQ Artemis and how you can configure it. To disable security completely simply set the `security-enabled` property to false in the `activemq-configuration.xml` file. @@ -12,15 +12,15 @@ is `10000` ms. ## Role based security for addresses -Apache ActiveMQ contains a flexible role-based security model for applying +Apache ActiveMQ Artemis contains a flexible role-based security model for applying security to queues, based on their addresses. -As explained in [Using Core](using-core.md), Apache ActiveMQ core consists mainly of sets of queues bound +As explained in [Using Core](using-core.md), Apache ActiveMQ Artemis core consists mainly of sets of queues bound to addresses. A message is sent to an address and the server looks up the set of queues that are bound to that address, the server then routes the message to those set of queues. -Apache ActiveMQ allows sets of permissions to be defined against the queues +Apache ActiveMQ Artemis allows sets of permissions to be defined against the queues based on their address. An exact match on the address can be used or a wildcard match can be used using the wildcard characters '`#`' and '`*`'. @@ -83,7 +83,7 @@ these addresses or consume messages from queues bound to an address that starts with the string "globalqueues.europe." The mapping between a user and what roles they have is handled by the -security manager. Apache ActiveMQ ships with a user manager that reads user +security manager. Apache ActiveMQ Artemis ships with a user manager that reads user credentials from a file on disk, and can also plug into JAAS or JBoss Application Server security. @@ -124,14 +124,14 @@ in sub-groups of addresses. When messaging clients are connected to servers, or servers are connected to other servers (e.g. via bridges) over an untrusted network -then Apache ActiveMQ allows that traffic to be encrypted using the Secure +then Apache ActiveMQ Artemis allows that traffic to be encrypted using the Secure Sockets Layer (SSL) transport. For more information on configuring the SSL transport, please see [Configuring the Transport](configuring-transports.md). ## Basic user credentials -Apache ActiveMQ ships with a security manager implementation that reads user +Apache ActiveMQ Artemis ships with a security manager implementation that reads user credentials, i.e. user names, passwords and role information from properties files on the classpath called `activemq-users.properties` and `activemq-roles.properties`. This is the default security manager. diff --git a/docs/user-manual/en/send-guarantees.md b/docs/user-manual/en/send-guarantees.md index a441337dae..d65bf67c8d 100644 --- a/docs/user-manual/en/send-guarantees.md +++ b/docs/user-manual/en/send-guarantees.md @@ -2,7 +2,7 @@ ## Guarantees of Transaction Completion -When committing or rolling back a transaction with Apache ActiveMQ, the request +When committing or rolling back a transaction with Apache ActiveMQ Artemis, the request to commit or rollback is sent to the server, and the call will block on the client side until a response has been received from the server that the commit or rollback was executed. @@ -27,7 +27,7 @@ This parameter is set in `activemq-configuration.xml` ## Guarantees of Non Transactional Message Sends If you are sending messages to a server using a non transacted session, -Apache ActiveMQ can be configured to block the call to send until the message +Apache ActiveMQ Artemis can be configured to block the call to send until the message has definitely reached the server, and a response has been sent back to the client. This can be configured individually for durable and non-durable messages, and is determined by the following two parameters: @@ -49,7 +49,7 @@ network round trip time (RTT) of your network, rather than the bandwidth of your network. For better performance we recommend either batching many messages sends together in a transaction since with a transactional session, only the commit / rollback blocks not every send, or, using -Apache ActiveMQ's advanced *asynchronous send acknowledgements feature* +Apache ActiveMQ Artemis's advanced *asynchronous send acknowledgements feature* described in Asynchronous Send Acknowledgements. If you are using JMS and JNDI then using the elements @@ -73,7 +73,7 @@ The default value for this parameter is `true`. ## Guarantees of Non Transactional Acknowledgements If you are acknowledging the delivery of a message at the client side -using a non transacted session, Apache ActiveMQ can be configured to block the +using a non transacted session, Apache ActiveMQ Artemis can be configured to block the call to acknowledge until the acknowledge has definitely reached the server, and a response has been sent back to the client. This is configured with the parameter `BlockOnAcknowledge`. If this is set to @@ -87,7 +87,7 @@ implement a strict *at most once* delivery policy. The default value is If you are using a non transacted session but want a guarantee that every message sent to the server has reached it, then, as discussed in -Guarantees of Non Transactional Message Sends, you can configure Apache ActiveMQ to block the call to send until the server +Guarantees of Non Transactional Message Sends, you can configure Apache ActiveMQ Artemis to block the call to send until the server has received the message, persisted it and sent back a response. This works well but has a severe performance penalty - each call to send needs to block for at least the time of a network round trip (RTT) - the @@ -108,8 +108,8 @@ messages are sent without blocking! These figures aren't an exact science but you can clearly see that being limited by network RTT can have serious effect on performance. -To remedy this, Apache ActiveMQ provides an advanced new feature called -*asynchronous send acknowledgements*. With this feature, Apache ActiveMQ can be +To remedy this, Apache ActiveMQ Artemis provides an advanced new feature called +*asynchronous send acknowledgements*. With this feature, Apache ActiveMQ Artemis can be configured to send messages without blocking in one direction and asynchronously getting acknowledgement from the server that the messages were received in a separate stream. By de-coupling the send from the @@ -132,7 +132,7 @@ a handler instance on your `ClientSession`. Then, you just send messages as normal using your `ClientSession`, and as messages reach the server, the server will send back an acknowledgement of the send asynchronously, and some time later you are -informed at the client side by Apache ActiveMQ calling your handler's +informed at the client side by Apache ActiveMQ Artemis calling your handler's `sendAcknowledged(ClientMessage message)` method, passing in a reference to the message that was sent. diff --git a/docs/user-manual/en/slow-consumers.md b/docs/user-manual/en/slow-consumers.md index 071c9aefa3..b53bac594c 100644 --- a/docs/user-manual/en/slow-consumers.md +++ b/docs/user-manual/en/slow-consumers.md @@ -1,6 +1,6 @@ #Detecting Slow Consumers -In this section we will discuss how Apache ActiveMQ can be configured to deal +In this section we will discuss how Apache ActiveMQ Artemis can be configured to deal with slow consumers. A slow consumer with a server-side queue (e.g. JMS topic subscriber) can pose a significant problem for broker performance. If messages build up in the consumer's server-side queue then memory diff --git a/docs/user-manual/en/spring-integration.md b/docs/user-manual/en/spring-integration.md index 1cdb454a62..21d112ea91 100644 --- a/docs/user-manual/en/spring-integration.md +++ b/docs/user-manual/en/spring-integration.md @@ -1,11 +1,11 @@ # Spring Integration -Apache ActiveMQ provides a simple bootstrap class, +Apache ActiveMQ Artemis provides a simple bootstrap class, `org.apache.activemq.integration.spring.SpringJmsBootstrap`, for -integration with Spring. To use it, you configure Apache ActiveMQ as you always +integration with Spring. To use it, you configure Apache ActiveMQ Artemis as you always would, through its various configuration files like `activemq-configuration.xml`, `activemq-jms.xml`, and -`activemq-users.xml`. The Spring helper class starts the Apache ActiveMQ server +`activemq-users.xml`. The Spring helper class starts the Apache ActiveMQ Artemis server and adds any factories or destinations configured within `activemq-jms.xml` directly into the namespace of the Spring context. Let's take this `activemq-jms.xml` file for instance: diff --git a/docs/user-manual/en/thread-pooling.md b/docs/user-manual/en/thread-pooling.md index fc547efd71..59500e779e 100644 --- a/docs/user-manual/en/thread-pooling.md +++ b/docs/user-manual/en/thread-pooling.md @@ -1,6 +1,6 @@ # Thread management -This chapter describes how Apache ActiveMQ uses and pools threads and how you +This chapter describes how Apache ActiveMQ Artemis uses and pools threads and how you can manage them. First we'll discuss how threads are managed and used on the server side, @@ -8,12 +8,12 @@ then we'll look at the client side. ## Server-Side Thread Management -Each Apache ActiveMQ Server maintains a single thread pool for general use, and +Each Apache ActiveMQ Artemis Server maintains a single thread pool for general use, and a scheduled thread pool for scheduled use. A Java scheduled thread pool cannot be configured to use a standard thread pool, otherwise we could use a single thread pool for both scheduled and non scheduled activity. -A separate thread pool is also used to service connections. Apache ActiveMQ can +A separate thread pool is also used to service connections. Apache ActiveMQ Artemis can use "old" (blocking) IO or "new" (non-blocking) IO also called NIO. Both of these options use a separate thread pool, but each of them behaves uniquely. @@ -33,7 +33,7 @@ However, even an unbounded thread pool can run into trouble if it becomes too large. If you require the server to handle many concurrent connections you should use NIO, not old IO. -When using new IO (NIO), Apache ActiveMQ will, by default, cap its thread pool +When using new IO (NIO), Apache ActiveMQ Artemis will, by default, cap its thread pool at three times the number of cores (or hyper-threads) as reported by ` Runtime.getRuntime().availableProcessors()` for processing incoming packets. To override this value, you can set the number of @@ -96,7 +96,7 @@ For more information on configuring the reaper, please see [message expiry](mess Asynchronous IO has a thread pool for receiving and dispatching events out of the native layer. You will find it on a thread dump with the -prefix ActiveMQ-AIO-poller-pool. Apache ActiveMQ uses one thread per opened +prefix ActiveMQ-AIO-poller-pool. Apache ActiveMQ Artemis uses one thread per opened file on the journal (there is usually one). There is also a single thread used to invoke writes on libaio. We do @@ -106,14 +106,14 @@ ActiveMQ-AIO-writer-pool. ## Client-Side Thread Management -On the client side, Apache ActiveMQ maintains a single static scheduled thread +On the client side, Apache ActiveMQ Artemis maintains a single static scheduled thread pool and a single static general thread pool for use by all clients using the same classloader in that JVM instance. The static scheduled thread pool has a maximum size of `5` threads, and the general purpose thread pool has an unbounded maximum size. -If required Apache ActiveMQ can also be configured so that each +If required Apache ActiveMQ Artemis can also be configured so that each `ClientSessionFactory` instance does not use these static pools but instead maintains its own scheduled and general purpose pool. Any sessions created from that `ClientSessionFactory` will use those pools @@ -149,7 +149,7 @@ environment, e.g. `jndi.properties`. Here's a simple example using the "ConnectionFactory" connection factory which is available in the context by default: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory java.naming.provider.url=tcp://localhost:61616 diff --git a/docs/user-manual/en/tools.md b/docs/user-manual/en/tools.md index 1df2324548..63a56ac648 100644 --- a/docs/user-manual/en/tools.md +++ b/docs/user-manual/en/tools.md @@ -1,6 +1,6 @@ # Tools -Apache ActiveMQ ships with several helpful command line tools. All tools are +Apache ActiveMQ Artemis ships with several helpful command line tools. All tools are available from the activemq-tools-\-jar-with-dependencies.jar. As the name suggests, this Java archive contains ActiveMQ along with all of its dependencies. This is done to simplify the execution of the tools @@ -55,7 +55,7 @@ java -jar activemq-tools--jar-with-dependencies.jar export /home/user/a - **`import`**. Used for importing data from an XML document generated by the `export` tool. The `import` tool reads the XML document and - connects to an Apache ActiveMQ server via Netty to import all the data. It + connects to an Apache ActiveMQ Artemis server via Netty to import all the data. It takes 5 parameters: - `input-file` - the path to the XML file generated by the diff --git a/docs/user-manual/en/transaction-config.md b/docs/user-manual/en/transaction-config.md index cbe6d802b0..5a98d75b96 100644 --- a/docs/user-manual/en/transaction-config.md +++ b/docs/user-manual/en/transaction-config.md @@ -1,13 +1,13 @@ # Resource Manager Configuration -Apache ActiveMQ has its own Resource Manager for handling the lifespan of JTA +Apache ActiveMQ Artemis has its own Resource Manager for handling the lifespan of JTA transactions. When a transaction is started the resource manager is notified and keeps a record of the transaction and its current state. It is possible in some cases for a transaction to be started but then forgotten about. Maybe the client died and never came back. If this happens then the transaction will just sit there indefinitely. -To cope with this Apache ActiveMQ can, if configured, scan for old transactions +To cope with this Apache ActiveMQ Artemis can, if configured, scan for old transactions and rollback any it finds. The default for this is 3000000 milliseconds (5 minutes), i.e. any transactions older than 5 minutes are removed. This timeout can be changed by editing the `transaction-timeout` @@ -15,7 +15,7 @@ property in `activemq-configuration.xml` (value must be in milliseconds). The property `transaction-timeout-scan-period` configures how often, in milliseconds, to scan for old transactions. -Please note that Apache ActiveMQ will not unilaterally rollback any XA +Please note that Apache ActiveMQ Artemis will not unilaterally rollback any XA transactions in a prepared state - this must be heuristically rolled back via the management API if you are sure they will never be resolved by the transaction manager. diff --git a/docs/user-manual/en/undelivered-messages.md b/docs/user-manual/en/undelivered-messages.md index 30e32cb5c5..724103106f 100644 --- a/docs/user-manual/en/undelivered-messages.md +++ b/docs/user-manual/en/undelivered-messages.md @@ -46,7 +46,7 @@ Delayed redelivery is defined in the address-setting configuration: -If a `redelivery-delay` is specified, Apache ActiveMQ will wait this delay +If a `redelivery-delay` is specified, Apache ActiveMQ Artemis will wait this delay before redelivering the messages. By default, there is no redelivery delay (`redelivery-delay`is set to @@ -92,7 +92,7 @@ to a dead letter address. Any such messages can then be diverted to queue(s) where they can later be perused by the system administrator for action to be taken. -Apache ActiveMQ's addresses can be assigned a dead letter address. Once the +Apache ActiveMQ Artemis's addresses can be assigned a dead letter address. Once the messages have been unsuccessfully delivered for a given number of attempts, they are removed from their queue and sent to the relevant dead letter address. These *dead letter* messages can later be consumed @@ -144,7 +144,7 @@ that shows how dead letter is configured and used with JMS. ## Delivery Count Persistence -In normal use, Apache ActiveMQ does not update delivery count *persistently* +In normal use, Apache ActiveMQ Artemis does not update delivery count *persistently* until a message is rolled back (i.e. the delivery count is not updated *before* the message is delivered to the consumer). In most messaging use cases, the messages are consumed, acknowledged and forgotten as soon @@ -160,7 +160,7 @@ delivery count. During the recovery phase, the server will not have knowledge of that and will deliver the message with `redelivered` set to `false` while it should be `true`. -As this behavior breaks strict JMS semantics, Apache ActiveMQ allows to persist +As this behavior breaks strict JMS semantics, Apache ActiveMQ Artemis allows to persist delivery count before message delivery but this feature is disabled by default due to performance implications. diff --git a/docs/user-manual/en/using-core.md b/docs/user-manual/en/using-core.md index d23cbac0aa..255c2284d9 100644 --- a/docs/user-manual/en/using-core.md +++ b/docs/user-manual/en/using-core.md @@ -1,6 +1,6 @@ # Using Core -Apache ActiveMQ core is a completely JMS-agnostic messaging system with its own +Apache ActiveMQ Artemis core is a completely JMS-agnostic messaging system with its own non-JMS API. We call this the *core API*. If you don't want to use JMS you can use the core API directly. The core @@ -41,16 +41,16 @@ please consult the Javadoc. - Messages can be specified with a priority value between 0 and 9. 0 represents the lowest priority and 9 represents the highest. - Apache ActiveMQ will attempt to deliver higher priority messages before + Apache ActiveMQ Artemis will attempt to deliver higher priority messages before lower priority ones. -- Messages can be specified with an optional expiry time. Apache ActiveMQ +- Messages can be specified with an optional expiry time. Apache ActiveMQ Artemis will not deliver messages after its expiry time has been exceeded. - Messages also have an optional timestamp which represents the time the message was sent. -- Apache ActiveMQ also supports the sending/consuming of very large messages +- Apache ActiveMQ Artemis also supports the sending/consuming of very large messages much larger than can fit in available RAM at any one time. ### Address @@ -132,7 +132,7 @@ ClientSession instances group ClientConsumers and ClientProducers. ClientSession instances can be registered with an optional `SendAcknowledgementHandler`. This allows your client code to be notified asynchronously when sent messages have successfully reached the -server. This unique Apache ActiveMQ feature, allows you to have full guarantees +server. This unique Apache ActiveMQ Artemis feature, allows you to have full guarantees that sent messages have reached the server without having to block on each message sent until a response is received. Blocking on each messages sent is costly since it requires a network round trip for each diff --git a/docs/user-manual/en/using-jms.md b/docs/user-manual/en/using-jms.md index 3212aaa6da..2ae15d4497 100644 --- a/docs/user-manual/en/using-jms.md +++ b/docs/user-manual/en/using-jms.md @@ -1,6 +1,6 @@ # Using JMS -Although Apache ActiveMQ provides a JMS agnostic messaging API, many users will +Although Apache ActiveMQ Artemis provides a JMS agnostic messaging API, many users will be more comfortable using JMS. JMS is a very popular API standard for messaging, and most messaging @@ -8,7 +8,7 @@ systems provide a JMS API. If you are completely new to JMS we suggest you follow the [Oracle JMS tutorial](http://docs.oracle.com/javaee/7/tutorial/partmessaging.htm) - a full JMS tutorial is out of scope for this guide. -Apache ActiveMQ also ships with a wide range of examples, many of which +Apache ActiveMQ Artemis also ships with a wide range of examples, many of which demonstrate JMS API usage. A good place to start would be to play around with the simple JMS Queue and Topic example, but we also provide examples for many other parts of the JMS API. A full description of the @@ -16,7 +16,7 @@ examples is available in [Examples](examples.md). In this section we'll go through the main steps in configuring the server for JMS and creating a simple JMS program. We'll also show how to -configure and use JNDI, and also how to use JMS with Apache ActiveMQ without +configure and use JNDI, and also how to use JMS with Apache ActiveMQ Artemis without using any JNDI. A simple ordering system @@ -42,18 +42,18 @@ JNDI Configuration The JMS specification establishes the convention that *administered objects* (i.e. JMS queue, topic and connection factory instances) are made available via the JNDI API. Brokers are free to implement JNDI as -they see fit assuming the implementation fits the API. Apache ActiveMQ does not +they see fit assuming the implementation fits the API. Apache ActiveMQ Artemis does not have a JNDI server. Rather, it uses a client-side JNDI implementation that relies on special properties set in the environment to construct the appropriate JMS objects. In other words, no objects are stored in -JNDI on the Apache ActiveMQ server, instead they are simply instantiated on the +JNDI on the Apache ActiveMQ Artemis server, instead they are simply instantiated on the client based on the provided configuration. Let's look at the different kinds of administered objects and how to configure them. > **Note** > > The following configuration properties *are strictly required when -> Apache ActiveMQ is running in stand-alone mode*. When Apache ActiveMQ is integrated +> Apache ActiveMQ Artemis is running in stand-alone mode*. When Apache ActiveMQ Artemis is integrated > to an application server (e.g. Wildfly) the application server itself > will almost certainly provide a JNDI client with its own properties. @@ -66,9 +66,9 @@ well as many other configuration parameters. Here's a simple example of the JNDI context environment for a client looking up a connection factory to access an *embedded* instance of -Apache ActiveMQ: +Apache ActiveMQ Artemis: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.invmConnectionFactory=vm://0 In this instance we have created a connection factory that is bound to @@ -81,7 +81,7 @@ have an InVM acceptor with a unique server-ID. A client using JMS and JNDI can account for this by specifying a connction factory for each server, like so: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.invmConnectionFactory0=vm://0 connectionFactory.invmConnectionFactory1=vm://1 connectionFactory.invmConnectionFactory2=vm://2 @@ -101,7 +101,7 @@ most commonly connect across a network a remote broker. Here's a simple example of a client configuring a connection factory to connect to a remote broker running on myhost:5445: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://myhost:5445 In the example above the client is using the `tcp` scheme for the @@ -180,7 +180,7 @@ are supported just like with `udp`. The default type for the default connection factory is of type `javax.jms.ConnectionFactory`. This can be changed by setting the type like so - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory java.naming.provider.url=tcp://localhost:5445?type=CF In this example it is still set to the default, below shows a list of types that can be set. @@ -203,7 +203,7 @@ connection factories, destinations can be configured using special properties in the JNDI context environment. The property *name* should follow the pattern: `queue.` or `topic.`. The property *value* should be the name of the queue hosted by the -Apache ActiveMQ server. For example, if the server had a JMS queue configured +Apache ActiveMQ Artemis server. For example, if the server had a JMS queue configured like so: @@ -211,7 +211,7 @@ like so: And if the client wanted to bind this queue to "queues/OrderQueue" then the JNDI properties would be configured like so: - java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory + java.naming.factory.initial=ActiveMQInitialContextFactory java.naming.provider.url=tcp://myhost:5445 queue.queues/OrderQueue=OrderQueue @@ -296,7 +296,7 @@ Although it is a very common JMS usage pattern to lookup JMS instances) from JNDI, in some cases you just think "Why do I need JNDI? Why can't I just instantiate these objects directly?" -With Apache ActiveMQ you can do exactly that. Apache ActiveMQ supports the direct +With Apache ActiveMQ Artemis you can do exactly that. Apache ActiveMQ Artemis supports the direct instantiation of JMS Queue, Topic and ConnectionFactory instances, so you don't have to use JNDI at all. diff --git a/docs/user-manual/en/using-server.md b/docs/user-manual/en/using-server.md index 8a22f8f054..87972592d2 100644 --- a/docs/user-manual/en/using-server.md +++ b/docs/user-manual/en/using-server.md @@ -1,12 +1,12 @@ # Using the Server -This chapter will familiarise you with how to use the Apache ActiveMQ server. +This chapter will familiarise you with how to use the Apache ActiveMQ Artemis server. We'll show where it is, how to start and stop it, and we'll describe the directory layout and what all the files are and what they do. -For the remainder of this chapter when we talk about the Apache ActiveMQ server -we mean the Apache ActiveMQ standalone server, in its default configuration +For the remainder of this chapter when we talk about the Apache ActiveMQ Artemis server +we mean the Apache ActiveMQ Artemis standalone server, in its default configuration with a JMS Service enabled. This document will refer to the full path of the directory where the ActiveMQ @@ -47,12 +47,12 @@ to do start running the broker instance is execute: Now that the broker is running, you can optionally run some of the included examples to verify the the broker is running properly. -To stop the Apache ActiveMQ instance you will use the same `activemq` script, but with +To stop the Apache ActiveMQ Artemis instance you will use the same `activemq` script, but with the `stop argument`. Example: /var/lib/mybroker/bin/activemq stop -Please note that Apache ActiveMQ requires a Java 7 or later runtime to run. +Please note that Apache ActiveMQ Artemis requires a Java 7 or later runtime to run. By default the `etc/bootstrap.xml` configuration is used. The configuration can be changed e.g. by running @@ -69,7 +69,7 @@ The run scripts set some JVM settings for tuning the garbage collection policy and heap size. We recommend using a parallel garbage collection algorithm to smooth out latency and minimise large GC pauses. -By default Apache ActiveMQ runs in a maximum of 1GiB of RAM. To increase the +By default Apache ActiveMQ Artemis runs in a maximum of 1GiB of RAM. To increase the memory settings change the `-Xms` and `-Xmx` memory settings as you would for any Java program. @@ -103,7 +103,7 @@ JVM will use the environment variable `LD_LIBRARY_PATH`. ## System properties -Apache ActiveMQ can take a system property on the command line for configuring +Apache ActiveMQ Artemis can take a system property on the command line for configuring logging. For more information on configuring logging, please see the section on @@ -155,11 +155,11 @@ The bootstrap file is very simple. Let's take a look at an example: ## The main configuration file. -The configuration for the Apache ActiveMQ core server is contained in +The configuration for the Apache ActiveMQ Artemis core server is contained in `activemq-configuration.xml`. This is what the FileConfiguration bean uses to configure the messaging server. -There are many attributes which you can configure Apache ActiveMQ. In most +There are many attributes which you can configure Apache ActiveMQ Artemis. In most cases the defaults will do fine, in fact every attribute can be defaulted which means a file with a single empty `configuration` element is a valid configuration file. The different configuration will be diff --git a/docs/user-manual/en/vertx-integration.md b/docs/user-manual/en/vertx-integration.md index 20168a957a..9c52a0fed3 100644 --- a/docs/user-manual/en/vertx-integration.md +++ b/docs/user-manual/en/vertx-integration.md @@ -4,14 +4,14 @@ application platform for the JVM that's designed for modern mobile, web, and enterprise applications. Vert.x provides a distributed event bus that allows messages to be sent across vert.x instances and clients. You -can now redirect and persist any vert.x messages to Apache ActiveMQ and route -those messages to a specified vertx address by configuring Apache ActiveMQ +can now redirect and persist any vert.x messages to Apache ActiveMQ Artemis and route +those messages to a specified vertx address by configuring Apache ActiveMQ Artemis vertx incoming and outgoing vertx connector services. ## Configuring a Vertx Incoming Connector Service Vertx Incoming Connector services receive messages from vertx event bus -and route them to an Apache ActiveMQ queue. Such a service can be configured as +and route them to an Apache ActiveMQ Artemis queue. Such a service can be configured as follows: @@ -25,7 +25,7 @@ follows: Shown are the required params for the connector service: -- `queue`. The name of the Apache ActiveMQ queue to send message to. +- `queue`. The name of the Apache ActiveMQ Artemis queue to send message to. As well as these required parameters there are the following optional parameters @@ -62,7 +62,7 @@ as follows: Shown are the required params for the connector service: -- `queue`. The name of the Apache ActiveMQ queue to fetch message from. +- `queue`. The name of the Apache ActiveMQ Artemis queue to fetch message from. As well as these required paramaters there are the following optional parameters diff --git a/docs/user-manual/en/wildcard-routing.md b/docs/user-manual/en/wildcard-routing.md index 202b053f4f..ee37877ee2 100644 --- a/docs/user-manual/en/wildcard-routing.md +++ b/docs/user-manual/en/wildcard-routing.md @@ -1,6 +1,6 @@ # Routing Messages With Wild Cards -Apache ActiveMQ allows the routing of messages via wildcard addresses. +Apache ActiveMQ Artemis allows the routing of messages via wildcard addresses. If a queue is created with an address of say `queue.news.#` then it will receive any messages sent to addresses that match this, for instance diff --git a/docs/user-manual/en/wildcard-syntax.md b/docs/user-manual/en/wildcard-syntax.md index a94adbac5a..34ed95fd15 100644 --- a/docs/user-manual/en/wildcard-syntax.md +++ b/docs/user-manual/en/wildcard-syntax.md @@ -1,11 +1,11 @@ -# Understanding the Apache ActiveMQ Wildcard Syntax +# Understanding the Apache ActiveMQ Artemis Wildcard Syntax -Apache ActiveMQ uses a specific syntax for representing wildcards in security +Apache ActiveMQ Artemis uses a specific syntax for representing wildcards in security settings, address settings and when creating consumers. The syntax is similar to that used by [AMQP](http://www.amqp.org). -An Apache ActiveMQ wildcard expression contains words delimited by the character +An Apache ActiveMQ Artemis wildcard expression contains words delimited by the character '`.`' (full stop). The special characters '`#`' and '`*`' also have special meaning and can diff --git a/etc/findbugs-exclude.xml b/etc/findbugs-exclude.xml index 776eee45c0..ae8aa46dfd 100644 --- a/etc/findbugs-exclude.xml +++ b/etc/findbugs-exclude.xml @@ -37,19 +37,19 @@ under the License. - - - + + + - - - - + + + + @@ -104,32 +104,32 @@ under the License. - + - + - + - + - + @@ -140,17 +140,17 @@ under the License. - + - + - + @@ -158,8 +158,8 @@ under the License. - - + + diff --git a/examples/core/embedded-remote/pom.xml b/examples/core/embedded-remote/pom.xml index f3085afb8b..8031f87977 100644 --- a/examples/core/embedded-remote/pom.xml +++ b/examples/core/embedded-remote/pom.xml @@ -24,27 +24,27 @@ under the License. org.apache.activemq.examples.core core-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-core-embedded-remote-example + artemis-core-embedded-remote-example jar ActiveMQ Artemis Core Embedded Remote Example org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-commons + artemis-commons ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} @@ -63,7 +63,7 @@ under the License. org.apache.activemq - activemq-server + artemis-server ${project.version} @@ -82,7 +82,7 @@ under the License. - org.apache.activemq.core.example.EmbeddedServer + org.apache.activemq.artemis.core.example.EmbeddedServer @@ -93,7 +93,7 @@ under the License. org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} @@ -112,7 +112,7 @@ under the License. - org.apache.activemq.core.example.EmbeddedRemoteExample + org.apache.activemq.artemis.core.example.EmbeddedRemoteExample diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java similarity index 83% rename from examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java rename to examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java index ed9fa8defc..453e40a18c 100644 --- a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java +++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.example; +package org.apache.activemq.artemis.core.example; import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; /** * diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedServer.java similarity index 83% rename from examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java rename to examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedServer.java index f6500c3990..d54b50b8d1 100644 --- a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java +++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedServer.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.example; +package org.apache.activemq.artemis.core.example; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServers; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServers; /** * An EmbeddedServer diff --git a/examples/core/embedded/pom.xml b/examples/core/embedded/pom.xml index 3aed991d74..e6408ab92e 100644 --- a/examples/core/embedded/pom.xml +++ b/examples/core/embedded/pom.xml @@ -24,27 +24,27 @@ under the License. org.apache.activemq.examples.core core-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-core-embedded-example + artemis-core-embedded-example jar ActiveMQ Artemis Core Embedded Example org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-commons + artemis-commons ${project.version} @@ -75,7 +75,7 @@ under the License. - org.apache.activemq.core.example.EmbeddedExample + org.apache.activemq.artemis.core.example.EmbeddedExample diff --git a/examples/core/embedded/src/main/java/org/apache/activemq/core/example/EmbeddedExample.java b/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java similarity index 78% rename from examples/core/embedded/src/main/java/org/apache/activemq/core/example/EmbeddedExample.java rename to examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java index c8d54053e2..b1017cd48a 100644 --- a/examples/core/embedded/src/main/java/org/apache/activemq/core/example/EmbeddedExample.java +++ b/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.example; +package org.apache.activemq.artemis.core.example; import java.util.Date; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.core.server.ActiveMQServers; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServers; /** * diff --git a/examples/core/perf/pom.xml b/examples/core/perf/pom.xml index 23283c8b93..1605fb7b35 100644 --- a/examples/core/perf/pom.xml +++ b/examples/core/perf/pom.xml @@ -24,22 +24,22 @@ under the License. org.apache.activemq.examples.core core-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-core-perf-example + artemis-core-perf-example jar ActiveMQ Artemis Perf Example org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-commons + artemis-commons ${project.version} @@ -49,7 +49,7 @@ under the License. org.apache.activemq.examples.jms - activemq-jms-examples-common + artemis-jms-examples-common ${project.version} @@ -65,7 +65,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start @@ -91,27 +91,27 @@ under the License. org.apache.activemq.examples.core - activemq-core-perf-example + artemis-core-perf-example ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} @@ -141,7 +141,7 @@ under the License. - org.apache.activemq.core.example.PerfListener + org.apache.activemq.artemis.core.example.PerfListener @@ -164,7 +164,7 @@ under the License. - org.apache.activemq.core.example.PerfSender + org.apache.activemq.artemis.core.example.PerfSender diff --git a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfBase.java b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfBase.java similarity index 94% rename from examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfBase.java rename to examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfBase.java index a6107f17ac..62a6ec0997 100644 --- a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfBase.java +++ b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfBase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.example; +package org.apache.activemq.artemis.core.example; import java.io.FileInputStream; import java.io.InputStream; @@ -26,21 +26,21 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Logger; -import org.apache.activemq.api.core.Message; -import org.apache.activemq.api.core.TransportConfiguration; -import org.apache.activemq.api.core.client.ClientConsumer; -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.ActiveMQClient; -import org.apache.activemq.api.core.client.MessageHandler; -import org.apache.activemq.api.core.client.SendAcknowledgementHandler; -import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq.utils.TokenBucketLimiter; -import org.apache.activemq.utils.TokenBucketLimiterImpl; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.MessageHandler; +import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.utils.TokenBucketLimiter; +import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl; /** * diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfListener.java similarity index 95% rename from examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java rename to examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfListener.java index 3934622f59..e7c57bc635 100644 --- a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java +++ b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfListener.java @@ -14,9 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.example; +package org.apache.activemq.artemis.core.example; -import java.util.Properties; import java.util.logging.Logger; public class PerfListener extends PerfBase diff --git a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfParams.java b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfParams.java similarity index 99% rename from examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfParams.java rename to examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfParams.java index 38094b23f7..48c82b1428 100644 --- a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfParams.java +++ b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfParams.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.core.example; +package org.apache.activemq.artemis.core.example; import java.io.Serializable; diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfSender.java similarity index 95% rename from examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java rename to examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfSender.java index df5e70095c..070dfd541b 100644 --- a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java +++ b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfSender.java @@ -14,9 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.jms.example; +package org.apache.activemq.artemis.core.example; -import java.util.Properties; import java.util.logging.Logger; public class PerfSender extends PerfBase diff --git a/examples/core/pom.xml b/examples/core/pom.xml index 5f5728f473..5ad1f5effa 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -23,8 +23,8 @@ under the License. org.apache.activemq.examples - activemq-examples - 10.0.0-SNAPSHOT + artemis-examples + 1.0.0-SNAPSHOT org.apache.activemq.examples.core diff --git a/examples/core/vertx-connector/pom.xml b/examples/core/vertx-connector/pom.xml index ece8b28d58..c764101d19 100644 --- a/examples/core/vertx-connector/pom.xml +++ b/examples/core/vertx-connector/pom.xml @@ -24,10 +24,10 @@ under the License. org.apache.activemq.examples.core core-examples - 10.0.0-SNAPSHOT + 1.0.0-SNAPSHOT - activemq-vertx-example + artemis-vertx-example jar ActiveMQ Artemis Vert.x Example @@ -37,17 +37,17 @@ under the License. org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-commons + artemis-commons ${project.version} @@ -86,7 +86,7 @@ under the License. org.apache.activemq - activemq-maven-plugin + artemis-maven-plugin start @@ -108,7 +108,7 @@ under the License. runClient - org.apache.activemq.core.example.VertxConnectorExample + org.apache.activemq.artemis.core.example.VertxConnectorExample @@ -121,32 +121,32 @@ under the License. org.apache.activemq.examples.core - activemq-vertx-example + artemis-vertx-example ${project.version} org.apache.activemq - activemq-vertx-integration + artemis-vertx-integration ${project.version} org.apache.activemq - activemq-core-client + artemis-core-client ${project.version} org.apache.activemq - activemq-server + artemis-server ${project.version} org.apache.activemq - activemq-jms-client + artemis-jms-client ${project.version} org.apache.activemq - activemq-jms-server + artemis-jms-server ${project.version} diff --git a/examples/core/vertx-connector/readme.html b/examples/core/vertx-connector/readme.html index 140d01725c..4f0241666f 100644 --- a/examples/core/vertx-connector/readme.html +++ b/examples/core/vertx-connector/readme.html @@ -28,21 +28,21 @@ under the License.

    Vert.x Connector Service Example

    This example shows you how to configure ActiveMQ to use the Vert.x Connector Service.

    - +

    ActiveMQ supports 2 types of Vert.x connector, incoming and outgoing. Incoming connector consumes from Vert.x event bus and forwards to a configurable address. Outgoing connector consumes from a configurable address and forwards to a configurable Vert.x event bus.

    - +

    In this example, an incoming connector and an outgoing connector are configured. A simple java Verticle is deployed. The verticle registers a message handler on the outgoing connector's address ("outgoing.vertx.address"). - A String message is sent to Vert.x event bus on the incoming connector's address("incoming.vertx.address"). - The message then will be forwarded to a ActiveMQ queue by the incoming connector. The outgoing connector listens to + A String message is sent to Vert.x event bus on the incoming connector's address("incoming.vertx.address"). + The message then will be forwarded to a ActiveMQ queue by the incoming connector. The outgoing connector listens to the ActiveMQ queue and forwards the message from ActiveMQ to Vert.x event bus on the outgoing connector's address. The verticle finally receives the message from it's event bus.

    - +

    For more information on Vert.x concept please visit the Vertx site

    - +

    Example step-by-step

    To run the server, simply type mvn verify from this directory.

    @@ -55,8 +55,8 @@ under the License.
  • We deploy a Verticle using the platformManager
    • -           String verticle = "org.apache.activemq.core.example.ExampleVerticle";
-           platformManager.deployVerticle(verticle, null, new URL[0], 1, null, 
+           String verticle = "org.apache.activemq.artemis.core.example.ExampleVerticle";
+           platformManager.deployVerticle(verticle, null, new URL[0], 1, null,
                   new Handler>(){
 
                      @Override
@@ -68,14 +68,14 @@ under the License.
                         }
                         latch0.countDown();
                      }
-            
+
            });
  • We register a message handler with the event bus in the Verticle to listen on the outgoing connector's address.
    •             EventBus eventBus = vertx.eventBus();
-           eventBus.registerHandler(VertxConnectorExample.OUTGOING, 
+           eventBus.registerHandler(VertxConnectorExample.OUTGOING,
                       new Handler>() {
                          @Override
                          public void handle(Message startMsg)
diff --git a/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/ExampleVerticle.java b/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java
similarity index 94%
rename from examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/ExampleVerticle.java
rename to examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java
index f9723c6cbe..80f4890e57 100644
--- a/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/ExampleVerticle.java
+++ b/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.core.example;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -34,7 +34,7 @@ public class ExampleVerticle extends Verticle
       final CountDownLatch latch0 = new CountDownLatch(1);
 
       // Register a handler on the outgoing connector's address
-      eventBus.registerHandler(VertxConnectorExample.OUTGOING, 
+      eventBus.registerHandler(VertxConnectorExample.OUTGOING,
                new Handler>() {
                   @Override
                   public void handle(Message startMsg)
diff --git a/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/VertxConnectorExample.java b/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java
similarity index 96%
rename from examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/VertxConnectorExample.java
rename to examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java
index dceca4198f..fabcbce694 100644
--- a/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/VertxConnectorExample.java
+++ b/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.core.example;
 
 import java.net.URL;
 import java.util.concurrent.CountDownLatch;
@@ -57,7 +57,7 @@ public class VertxConnectorExample
          final CountDownLatch latch0 = new CountDownLatch(1);
 
          // Step 2 Deploy a Verticle to receive message
-         String verticle = "org.apache.activemq.core.example.ExampleVerticle";
+         String verticle = "org.apache.activemq.artemis.core.example.ExampleVerticle";
          platformManager.deployVerticle(verticle, null, new URL[0], 1, null,
                   new Handler>(){
 
diff --git a/examples/jms/aerogear/pom.xml b/examples/jms/aerogear/pom.xml
index 93e63747d1..c27902e4b1 100644
--- a/examples/jms/aerogear/pom.xml
+++ b/examples/jms/aerogear/pom.xml
@@ -24,7 +24,7 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
    
@@ -33,14 +33,14 @@ under the License.
       
    
 
-   activemq-jms-aerogear-example
+   artemis-jms-aerogear-example
    jar
    ActiveMQ Artemis JMS AeroGear Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -56,7 +56,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -106,32 +106,32 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-aerogear-example
+                        artemis-jms-aerogear-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-aerogear-integration
+                        artemis-aerogear-integration
                         ${project.version}
                      
                      
diff --git a/examples/jms/aerogear/src/main/java/org/apache/activemq/jms/example/AerogearExample.java b/examples/jms/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java
similarity index 96%
rename from examples/jms/aerogear/src/main/java/org/apache/activemq/jms/example/AerogearExample.java
rename to examples/jms/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java
index d7cd36a72c..271cd7390c 100644
--- a/examples/jms/aerogear/src/main/java/org/apache/activemq/jms/example/AerogearExample.java
+++ b/examples/jms/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message.
diff --git a/examples/jms/aerogear/src/main/resources/jndi.properties b/examples/jms/aerogear/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/aerogear/src/main/resources/jndi.properties
+++ b/examples/jms/aerogear/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/application-layer-failover/pom.xml b/examples/jms/application-layer-failover/pom.xml
index 205fe6d2fa..e91a9e0d9b 100644
--- a/examples/jms/application-layer-failover/pom.xml
+++ b/examples/jms/application-layer-failover/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-application-layer-failover-example
+   artemis-jms-application-layer-failover-example
    jar
    ActiveMQ Artemis JMS Application Layer Failover Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -113,27 +113,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-application-layer-failover-example
+                        artemis-jms-application-layer-failover-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java b/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java
similarity index 98%
rename from examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java
rename to examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java
index 345764f42c..78120addd7 100644
--- a/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java
+++ b/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.lang.Object;
 import java.lang.String;
@@ -33,7 +33,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates application-layer failover of the JMS connection from one node to another
diff --git a/examples/jms/activemq-jms-examples-common/common.css b/examples/jms/artemis-jms-examples-common/common.css
similarity index 100%
rename from examples/jms/activemq-jms-examples-common/common.css
rename to examples/jms/artemis-jms-examples-common/common.css
diff --git a/examples/jms/activemq-jms-examples-common/config/logging.properties b/examples/jms/artemis-jms-examples-common/config/logging.properties
similarity index 90%
rename from examples/jms/activemq-jms-examples-common/config/logging.properties
rename to examples/jms/artemis-jms-examples-common/config/logging.properties
index 5f95c08548..3c6f629b81 100644
--- a/examples/jms/activemq-jms-examples-common/config/logging.properties
+++ b/examples/jms/artemis-jms-examples-common/config/logging.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,9 +34,9 @@
 # show messages at the INFO and above levels.
 handlers=java.util.logging.ConsoleHandler
 #handlers=java.util.logging.ConsoleHandler,java.util.logging.FileHandler
-java.util.logging.ConsoleHandler.formatter=org.apache.activemq6.integration.logging.ActiveMQLoggerFormatter
+java.util.logging.ConsoleHandler.formatter=org.apache.activemq.artemis.integration.logging.ActiveMQLoggerFormatter
 java.util.logging.FileHandler.level=INFO
-java.util.logging.FileHandler.formatter=org.apache.activemq6.integration.logging.ActiveMQLoggerFormatter
+java.util.logging.FileHandler.formatter=org.apache.activemq.artemis.integration.logging.ActiveMQLoggerFormatter
 java.util.logging.FileHandler.pattern=logs/activemq.log
 # Default global logging level.
 # This specifies which kinds of events are logged across
diff --git a/examples/jms/activemq-jms-examples-common/config/server.properties b/examples/jms/artemis-jms-examples-common/config/server.properties
similarity index 90%
rename from examples/jms/activemq-jms-examples-common/config/server.properties
rename to examples/jms/artemis-jms-examples-common/config/server.properties
index 7fe0d76c61..8d6cc7ab6c 100644
--- a/examples/jms/activemq-jms-examples-common/config/server.properties
+++ b/examples/jms/artemis-jms-examples-common/config/server.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-server.args=-XX:+UseParallelGC -Xms256M -Xmx256M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Djava.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+server.args=-XX:+UseParallelGC -Xms256M -Xmx256M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Djava.naming.factory.initial=ActiveMQInitialContextFactory
diff --git a/examples/jms/activemq-jms-examples-common/pom.xml b/examples/jms/artemis-jms-examples-common/pom.xml
similarity index 87%
rename from examples/jms/activemq-jms-examples-common/pom.xml
rename to examples/jms/artemis-jms-examples-common/pom.xml
index f5fb293b98..6849536a9f 100644
--- a/examples/jms/activemq-jms-examples-common/pom.xml
+++ b/examples/jms/artemis-jms-examples-common/pom.xml
@@ -24,10 +24,10 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-examples-common
+   artemis-jms-examples-common
    jar
    ActiveMQ Artemis Examples common
 
@@ -38,17 +38,17 @@ under the License.
       
       
          org.apache.activemq
-         activemq-commons
+         artemis-commons
          ${project.version}
       
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
    
diff --git a/examples/jms/activemq-jms-examples-common/prettify.css b/examples/jms/artemis-jms-examples-common/prettify.css
similarity index 100%
rename from examples/jms/activemq-jms-examples-common/prettify.css
rename to examples/jms/artemis-jms-examples-common/prettify.css
diff --git a/examples/jms/activemq-jms-examples-common/prettify.js b/examples/jms/artemis-jms-examples-common/prettify.js
similarity index 100%
rename from examples/jms/activemq-jms-examples-common/prettify.js
rename to examples/jms/artemis-jms-examples-common/prettify.js
diff --git a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java b/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
similarity index 92%
rename from examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java
rename to examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
index c94be4e9f8..d47e9962b9 100644
--- a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java
+++ b/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
@@ -14,24 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.common.example;
+package org.apache.activemq.artemis.common.example;
+
 import java.io.File;
 import java.util.HashMap;
-import java.util.Properties;
 import java.util.logging.Logger;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
-import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.client.impl.DelegatingSession;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.jms.client.ActiveMQConnection;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.client.impl.DelegatingSession;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 
 /**
  * Base class for ActiveMQ examples.
diff --git a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/DummyXid.java b/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/DummyXid.java
similarity index 98%
rename from examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/DummyXid.java
rename to examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/DummyXid.java
index 6625227af0..ede6dc5dc2 100644
--- a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/DummyXid.java
+++ b/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/DummyXid.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.common.example;
+package org.apache.activemq.artemis.common.example;
 
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.utils.Base64;
+import org.apache.activemq.artemis.utils.Base64;
 
 public class DummyXid implements Xid
 {
diff --git a/examples/jms/activemq-ra-rar/pom.xml b/examples/jms/artemis-ra-rar/pom.xml
similarity index 86%
rename from examples/jms/activemq-ra-rar/pom.xml
rename to examples/jms/artemis-ra-rar/pom.xml
index bdc411743d..e77739cabb 100644
--- a/examples/jms/activemq-ra-rar/pom.xml
+++ b/examples/jms/artemis-ra-rar/pom.xml
@@ -24,26 +24,26 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-rar
+   artemis-rar
    rar
    ActiveMQ Artemis JMS RA
 
    
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
          
             
                org.apache.activemq
-               activemq-core-client
+               artemis-core-client
             
             
                org.apache.activemq
-               activemq-jms-client
+               artemis-jms-client
             
             
               org.apache.geronimo.specs
@@ -57,22 +57,22 @@ under the License.
       
       
          org.apache.activemq
-         activemq-ra
+         artemis-ra
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
          
             
                org.apache.activemq
-               activemq-core-client
+               artemis-core-client
             
          
       
diff --git a/examples/jms/activemq-ra-rar/src/main/resources/ra.xml b/examples/jms/artemis-ra-rar/src/main/resources/ra.xml
similarity index 92%
rename from examples/jms/activemq-ra-rar/src/main/resources/ra.xml
rename to examples/jms/artemis-ra-rar/src/main/resources/ra.xml
index c21311c500..75b14b1f76 100644
--- a/examples/jms/activemq-ra-rar/src/main/resources/ra.xml
+++ b/examples/jms/artemis-ra-rar/src/main/resources/ra.xml
@@ -36,15 +36,15 @@
    
 
    
-      org.apache.activemq6.ra.ActiveMQResourceAdapter
+      org.apache.activemq.artemis.ra.ActiveMQResourceAdapter
       
          
             The transport type. Multiple connectors can be configured by using a comma separated list,
-            i.e. org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory.
+            i.e. org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory.
          
          ConnectorClassName
          java.lang.String
-         org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory
+         org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory
       
       
          The transport configuration. These values must be in the form of key=val;key=val;,
@@ -219,7 +219,7 @@
         
       
       
-        The max connections        
+        The max connections
         java.lang.Integer
         
       
@@ -257,12 +257,12 @@
         The class definition (full qualified name and its properties) used to encrypt the password
         PasswordCodec
         java.lang.String
-        org.apache.activemq6.utils.DefaultSensitiveStringCodec;key=clusterpassword;algorithm=something
+        org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec;key=clusterpassword;algorithm=something
       -->
 
       
          
-            org.apache.activemq6.ra.ActiveMQRAManagedConnectionFactory
+            org.apache.activemq.artemis.ra.ActiveMQRAManagedConnectionFactory
 
             
                The default session type
@@ -277,10 +277,10 @@
                0
             
 
-            org.apache.activemq6.ra.ActiveMQRAConnectionFactory
-            org.apache.activemq6.ra.ActiveMQRAConnectionFactoryImpl
+            org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactory
+            org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactoryImpl
             javax.jms.Session
-            org.apache.activemq6.ra.ActiveMQRASession
+            org.apache.activemq.artemis.ra.ActiveMQRASession
          
          XATransaction
          
@@ -295,7 +295,7 @@
             
                javax.jms.MessageListener
                
-                  org.apache.activemq6.ra.inflow.ActiveMQActivationSpec
+                  org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec
                   
                       destination
                   
diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml
index bb647046cc..9e5bf122b4 100644
--- a/examples/jms/bridge/pom.xml
+++ b/examples/jms/bridge/pom.xml
@@ -24,22 +24,22 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-bridge-example
+   artemis-jms-bridge-example
    jar
    ActiveMQ Artemis JMS Bridge Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
       
@@ -55,7 +55,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -117,27 +117,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-bridge-example
+                        artemis-jms-bridge-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java b/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java
similarity index 98%
rename from examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java
rename to examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java
index ce51d5597e..2eccf54c7c 100644
--- a/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java
+++ b/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates a core bridge set-up between two nodes, consuming messages from a queue
diff --git a/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/HatColourChangeTransformer.java b/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/HatColourChangeTransformer.java
similarity index 84%
rename from examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/HatColourChangeTransformer.java
rename to examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/HatColourChangeTransformer.java
index e9dac55468..a77d2e31f0 100644
--- a/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/HatColourChangeTransformer.java
+++ b/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/HatColourChangeTransformer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.cluster.Transformer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.cluster.Transformer;
 
 public class HatColourChangeTransformer implements Transformer
 {
diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml
index d6cbb7fbec..8a5b8af6e9 100644
--- a/examples/jms/browser/pom.xml
+++ b/examples/jms/browser/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-browser-example
+   artemis-jms-browser-example
    jar
    ActiveMQ Artemis JMS Browser Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -80,27 +80,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-browser-example
+                        artemis-jms-browser-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java b/examples/jms/browser/src/main/java/org/apache/activemq/artemis/jms/example/QueueBrowserExample.java
similarity index 97%
rename from examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java
rename to examples/jms/browser/src/main/java/org/apache/activemq/artemis/jms/example/QueueBrowserExample.java
index 98405c9fb1..8c24e49f7f 100644
--- a/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java
+++ b/examples/jms/browser/src/main/java/org/apache/activemq/artemis/jms/example/QueueBrowserExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Enumeration;
 
@@ -28,7 +28,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example which shows how to use a QueueBrowser to look at messages of a queue without removing them from the queue
diff --git a/examples/jms/browser/src/main/resources/jndi.properties b/examples/jms/browser/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/browser/src/main/resources/jndi.properties
+++ b/examples/jms/browser/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml
index ac5f24c242..1aca7094ed 100644
--- a/examples/jms/client-kickoff/pom.xml
+++ b/examples/jms/client-kickoff/pom.xml
@@ -24,22 +24,22 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-client-kickoff-example
+   artemis-jms-client-kickoff-example
    jar
    ActiveMQ Artemis JMS Kick Off Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
       
       
@@ -55,7 +55,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -111,27 +111,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-client-kickoff-example
+                        artemis-jms-client-kickoff-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
similarity index 94%
rename from examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java
rename to examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
index 014a7d47f1..ddeed5967e 100644
--- a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java
+++ b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicReference;
@@ -31,9 +31,9 @@ import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.management.ActiveMQServerControl;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example that shows how to kick off a client connected to ActiveMQ by using JMX.
diff --git a/examples/jms/client-kickoff/src/main/resources/jndi.properties b/examples/jms/client-kickoff/src/main/resources/jndi.properties
index 40ed6404f5..ed96c02136 100644
--- a/examples/jms/client-kickoff/src/main/resources/jndi.properties
+++ b/examples/jms/client-kickoff/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
diff --git a/examples/jms/client-side-failoverlistener/pom.xml b/examples/jms/client-side-failoverlistener/pom.xml
index 14ae7ed52f..f7a86f8cff 100644
--- a/examples/jms/client-side-failoverlistener/pom.xml
+++ b/examples/jms/client-side-failoverlistener/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-client-side-fileoverlistener-example
+   artemis-jms-client-side-fileoverlistener-example
    jar
    ActiveMQ Artemis JMS Client Side Failover listener Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -129,27 +129,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-client-side-fileoverlistener-example
+                        artemis-jms-client-side-fileoverlistener-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java b/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java
similarity index 93%
rename from examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java
rename to examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java
index 2e7eb3b96a..a6cfc71ec4 100644
--- a/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java
+++ b/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,10 +25,10 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.client.FailoverEventListener;
-import org.apache.activemq.api.core.client.FailoverEventType;
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.api.core.client.FailoverEventListener;
+import org.apache.activemq.artemis.api.core.client.FailoverEventType;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
 
 /**
  * This example demonstrates how you can listen on failover event on the client side
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties b/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
index 0dac60eed0..07c84f2410 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/client-side-load-balancing/pom.xml b/examples/jms/client-side-load-balancing/pom.xml
index f2cdb3d2c1..4e4206e236 100644
--- a/examples/jms/client-side-load-balancing/pom.xml
+++ b/examples/jms/client-side-load-balancing/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-client-side-load-balancing-example
+   artemis-jms-client-side-load-balancing-example
    jar
    ActiveMQ Artemis JMS Client Side Load Balancing Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -149,27 +149,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-client-side-load-balancing-example
+                        artemis-jms-client-side-load-balancing-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java b/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideLoadBalancingExample.java
similarity index 90%
rename from examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java
rename to examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideLoadBalancingExample.java
index 98eea5e2b3..4ee5b95ef5 100644
--- a/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java
+++ b/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideLoadBalancingExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates how sessions created from a single connection can be load
@@ -77,9 +77,9 @@ public class ClientSideLoadBalancingExample extends ActiveMQExample
          Session sessionB = connectionB.createSession(false, Session.AUTO_ACKNOWLEDGE);
          Session sessionC = connectionC.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-         System.out.println("Session A - " + ((org.apache.activemq.core.client.impl.DelegatingSession) ((org.apache.activemq.jms.client.ActiveMQSession) sessionA).getCoreSession()).getConnection().getRemoteAddress() );
-         System.out.println("Session B - " + ((org.apache.activemq.core.client.impl.DelegatingSession) ((org.apache.activemq.jms.client.ActiveMQSession) sessionB).getCoreSession()).getConnection().getRemoteAddress() );
-         System.out.println("Session C - " + ((org.apache.activemq.core.client.impl.DelegatingSession) ((org.apache.activemq.jms.client.ActiveMQSession) sessionC).getCoreSession()).getConnection().getRemoteAddress() );
+         System.out.println("Session A - " + ((org.apache.activemq.artemis.core.client.impl.DelegatingSession) ((org.apache.activemq.artemis.jms.client.ActiveMQSession) sessionA).getCoreSession()).getConnection().getRemoteAddress() );
+         System.out.println("Session B - " + ((org.apache.activemq.artemis.core.client.impl.DelegatingSession) ((org.apache.activemq.artemis.jms.client.ActiveMQSession) sessionB).getCoreSession()).getConnection().getRemoteAddress() );
+         System.out.println("Session C - " + ((org.apache.activemq.artemis.core.client.impl.DelegatingSession) ((org.apache.activemq.artemis.jms.client.ActiveMQSession) sessionC).getCoreSession()).getConnection().getRemoteAddress() );
 
          // Step 6. We create JMS MessageProducer objects on the sessions
          MessageProducer producerA = sessionA.createProducer(queue);
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties b/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
index 81cf89854d..0aa403a679 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
+++ b/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=udp://231.7.7.7:9876
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/clustered-durable-subscription/pom.xml b/examples/jms/clustered-durable-subscription/pom.xml
index 1519599c76..b169bf5107 100644
--- a/examples/jms/clustered-durable-subscription/pom.xml
+++ b/examples/jms/clustered-durable-subscription/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-clustered-durable-subscription-example
+   artemis-jms-clustered-durable-subscription-example
    jar
    ActiveMQ Artemis JMS Clustered Durable Subscription Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -124,27 +124,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-clustered-durable-subscription-example
+                        artemis-jms-clustered-durable-subscription-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/jms/example/ClusteredDurableSubscriptionExample.java b/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
similarity index 98%
rename from examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/jms/example/ClusteredDurableSubscriptionExample.java
rename to examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
index 5f2b9edea8..cecf3ac1bf 100644
--- a/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/jms/example/ClusteredDurableSubscriptionExample.java
+++ b/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that shows a JMS Durable Subscription across two nodes of a cluster.
diff --git a/examples/jms/clustered-grouping/pom.xml b/examples/jms/clustered-grouping/pom.xml
index 03bb0c7370..c772822891 100644
--- a/examples/jms/clustered-grouping/pom.xml
+++ b/examples/jms/clustered-grouping/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-clustered-grouping-example
+   artemis-jms-clustered-grouping-example
    jar
    ActiveMQ Artemis JMS CLustered Grouping Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -162,27 +162,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-clustered-grouping-example
+                        artemis-jms-clustered-grouping-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/jms/example/ClusteredGroupingExample.java b/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java
similarity index 98%
rename from examples/jms/clustered-grouping/src/main/java/org/apache/activemq/jms/example/ClusteredGroupingExample.java
rename to examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java
index 5e7bccd917..c5cd7909f2 100644
--- a/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/jms/example/ClusteredGroupingExample.java
+++ b/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates server side load-balancing of messages between the queue instances on different
diff --git a/examples/jms/clustered-jgroups/pom.xml b/examples/jms/clustered-jgroups/pom.xml
index 37c2085533..494211fab8 100644
--- a/examples/jms/clustered-jgroups/pom.xml
+++ b/examples/jms/clustered-jgroups/pom.xml
@@ -24,7 +24,7 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
    clustered-jgroups
@@ -34,7 +34,7 @@ under the License.
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -127,22 +127,22 @@ under the License.
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java
similarity index 97%
rename from examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java
rename to examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java
index 226c7f2a7e..29892b93e1 100644
--- a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java
+++ b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates clustering using jgroups.
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
index 40ed6404f5..ed96c02136 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
index e305f48ec7..b95f5a1101 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 java.naming.provider.url=tcp://localhost:61617
diff --git a/examples/jms/clustered-queue/pom.xml b/examples/jms/clustered-queue/pom.xml
index c01902006d..e009c1c657 100644
--- a/examples/jms/clustered-queue/pom.xml
+++ b/examples/jms/clustered-queue/pom.xml
@@ -24,7 +24,7 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
    clustered-queue
@@ -34,7 +34,7 @@ under the License.
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -123,22 +123,22 @@ under the License.
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueExample.java
similarity index 97%
rename from examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java
rename to examples/jms/clustered-queue/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueExample.java
index 9e4c0216ad..9781771b8d 100644
--- a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java
+++ b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates server side load-balancing of messages between the queue instances on different
diff --git a/examples/jms/clustered-standalone/pom.xml b/examples/jms/clustered-standalone/pom.xml
index 27e1f6b9e7..cf7b1bc5d3 100644
--- a/examples/jms/clustered-standalone/pom.xml
+++ b/examples/jms/clustered-standalone/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-clustered-standalone-example
+   artemis-jms-clustered-standalone-example
    jar
    ActiveMQ Artemis JMS Clustered Standalone Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -150,27 +150,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-clustered-standalone-example
+                        artemis-jms-clustered-standalone-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredStandaloneExample.java
similarity index 98%
rename from examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java
rename to examples/jms/clustered-standalone/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredStandaloneExample.java
index 6ca3f8bec3..fac5ba60eb 100644
--- a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java
+++ b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredStandaloneExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 public class ClusteredStandaloneExample extends ActiveMQExample
 {
diff --git a/examples/jms/clustered-static-discovery/pom.xml b/examples/jms/clustered-static-discovery/pom.xml
index 201026f372..2b51c7e4ce 100644
--- a/examples/jms/clustered-static-discovery/pom.xml
+++ b/examples/jms/clustered-static-discovery/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-clustered-static-discovery-example
+   artemis-jms-clustered-static-discovery-example
    jar
    ActiveMQ Artemis JMS Clustered Static Discovery Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -152,27 +152,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-clustered-static-discovery-example
+                        artemis-jms-clustered-static-discovery-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java b/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/artemis/jms/example/StaticClusteredQueueExample.java
similarity index 98%
rename from examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java
rename to examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/artemis/jms/example/StaticClusteredQueueExample.java
index 9e2d5f3937..abc26c2fe0 100644
--- a/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java
+++ b/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/artemis/jms/example/StaticClusteredQueueExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates server side load-balancing of messages between the queue instances on different
diff --git a/examples/jms/clustered-static-oneway/pom.xml b/examples/jms/clustered-static-oneway/pom.xml
index 8fe370554c..7f5e67c9c7 100644
--- a/examples/jms/clustered-static-oneway/pom.xml
+++ b/examples/jms/clustered-static-oneway/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-clustered-static-oneway-example
+   artemis-jms-clustered-static-oneway-example
    jar
    ActiveMQ Artemis JMS Clustered Static One Way Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -132,27 +132,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-clustered-static-oneway-example
+                        artemis-jms-clustered-static-oneway-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java b/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/artemis/jms/example/ClusterStaticOnewayExample.java
similarity index 98%
rename from examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java
rename to examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/artemis/jms/example/ClusterStaticOnewayExample.java
index 8d2af3519c..1bfe8585f0 100644
--- a/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java
+++ b/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/artemis/jms/example/ClusterStaticOnewayExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates server side load-balancing of messages between the queue instances on different
diff --git a/examples/jms/clustered-topic/pom.xml b/examples/jms/clustered-topic/pom.xml
index 04da050493..dc033206aa 100644
--- a/examples/jms/clustered-topic/pom.xml
+++ b/examples/jms/clustered-topic/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-clustered-topic-example
+   artemis-jms-clustered-topic-example
    jar
    ActiveMQ Artemis JMS Clustered Topic Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -132,27 +132,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-clustered-topic-example
+                        artemis-jms-clustered-topic-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java b/examples/jms/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
similarity index 97%
rename from examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java
rename to examples/jms/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
index 6ad2e86391..4378954d3f 100644
--- a/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java
+++ b/examples/jms/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that shows a JMS Topic clustered across two nodes of a cluster.
diff --git a/examples/jms/colocated-failover-scale-down/pom.xml b/examples/jms/colocated-failover-scale-down/pom.xml
index c953a937f6..e6f0d7109f 100644
--- a/examples/jms/colocated-failover-scale-down/pom.xml
+++ b/examples/jms/colocated-failover-scale-down/pom.xml
@@ -24,7 +24,7 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
    colocated-failover-scale-down
@@ -34,7 +34,7 @@ under the License.
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -129,22 +129,22 @@ under the License.
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
similarity index 97%
rename from examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java
rename to examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
index af381fbd0f..b4b8ce6f36 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java
+++ b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates server side load-balancing of messages between the queue instances on different
diff --git a/examples/jms/colocated-failover/pom.xml b/examples/jms/colocated-failover/pom.xml
index 33a2b80112..a50b09ab61 100644
--- a/examples/jms/colocated-failover/pom.xml
+++ b/examples/jms/colocated-failover/pom.xml
@@ -24,7 +24,7 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
    colocated-failover
@@ -34,7 +34,7 @@ under the License.
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -129,22 +129,22 @@ under the License.
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
similarity index 98%
rename from examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java
rename to examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
index 4c6a9a9b84..163faecf42 100644
--- a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java
+++ b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates a colocated server
diff --git a/examples/jms/consumer-rate-limit/pom.xml b/examples/jms/consumer-rate-limit/pom.xml
index c23c0cee97..1e4236fbfb 100644
--- a/examples/jms/consumer-rate-limit/pom.xml
+++ b/examples/jms/consumer-rate-limit/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-consumer-rate-limit-example
+   artemis-jms-consumer-rate-limit-example
    jar
    ActiveMQ Artemis JMS Consumer Rate Limit Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -88,27 +88,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-consumer-rate-limit-example
+                        artemis-jms-consumer-rate-limit-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java b/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/artemis/jms/example/ConsumerRateLimitExample.java
similarity index 97%
rename from examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java
rename to examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/artemis/jms/example/ConsumerRateLimitExample.java
index a4abd9f948..8c5f937e7b 100644
--- a/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java
+++ b/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/artemis/jms/example/ConsumerRateLimitExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates how a message consumer can be limited to consumer messages at a maximum rate
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties b/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties
index e3393f8cea..c7c59beb86 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties
+++ b/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?consumerMaxRate=10
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/dead-letter/pom.xml b/examples/jms/dead-letter/pom.xml
index eec006df61..0f50f2d706 100644
--- a/examples/jms/dead-letter/pom.xml
+++ b/examples/jms/dead-letter/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-dead-letter-example
+   artemis-jms-dead-letter-example
    jar
    ActiveMQ Artemis JMS Dead Letter Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -88,27 +88,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-dead-letter-example
+                        artemis-jms-dead-letter-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java b/examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java
similarity index 98%
rename from examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java
rename to examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java
index d4f6f71736..30d8f602e9 100644
--- a/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java
+++ b/examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example showing how messages are moved to dead letter destination when they are unsuccessfully delivered multiple times
diff --git a/examples/jms/dead-letter/src/main/resources/jndi.properties b/examples/jms/dead-letter/src/main/resources/jndi.properties
index 90492492e4..ea5cd8207d 100644
--- a/examples/jms/dead-letter/src/main/resources/jndi.properties
+++ b/examples/jms/dead-letter/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
 queue.queue/deadLetterQueue=deadLetterQueue
diff --git a/examples/jms/delayed-redelivery/pom.xml b/examples/jms/delayed-redelivery/pom.xml
index f148374dbc..5e8732edc9 100644
--- a/examples/jms/delayed-redelivery/pom.xml
+++ b/examples/jms/delayed-redelivery/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-delayed-redelivery-example
+   artemis-jms-delayed-redelivery-example
    jar
    ActiveMQ Artemis JMS Delayed Redelivery Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -80,27 +80,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-delayed-redelivery-example
+                        artemis-jms-delayed-redelivery-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
similarity index 97%
rename from examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java
rename to examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
index 3651232a32..2aa4a6226f 100644
--- a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java
+++ b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates how ActiveMQ can be configured with a redelivery delay in the event a message
diff --git a/examples/jms/delayed-redelivery/src/main/resources/jndi.properties b/examples/jms/delayed-redelivery/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/jndi.properties
+++ b/examples/jms/delayed-redelivery/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/divert/pom.xml b/examples/jms/divert/pom.xml
index 726ab81e71..9037f0c03f 100644
--- a/examples/jms/divert/pom.xml
+++ b/examples/jms/divert/pom.xml
@@ -24,22 +24,22 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-divert-example
+   artemis-jms-divert-example
    jar
    ActiveMQ Artemis JMS Divert Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
       
@@ -55,7 +55,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -117,27 +117,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-divert-example
+                        artemis-jms-divert-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/AddForwardingTimeTransformer.java b/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java
similarity index 81%
rename from examples/jms/divert/src/main/java/org/apache/activemq/jms/example/AddForwardingTimeTransformer.java
rename to examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java
index 1e334f1443..e0c15a94ee 100644
--- a/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/AddForwardingTimeTransformer.java
+++ b/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.cluster.Transformer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.cluster.Transformer;
 
 public class AddForwardingTimeTransformer implements Transformer
 {
diff --git a/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java b/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java
similarity index 99%
rename from examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java
rename to examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java
index 8347bb48c6..bfc3e2b66c 100644
--- a/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java
+++ b/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -29,7 +29,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This examples demonstrates the use of ActiveMQ "Diverts" to transparently divert or copy messages
diff --git a/examples/jms/durable-subscription/pom.xml b/examples/jms/durable-subscription/pom.xml
index cfeb5f9749..d4b4d4043b 100644
--- a/examples/jms/durable-subscription/pom.xml
+++ b/examples/jms/durable-subscription/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-durable-subscription-example
+   artemis-jms-durable-subscription-example
    jar
    ActiveMQ Artemis JMS Durable Subscription Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -88,27 +88,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-durable-subscription-example
+                        artemis-jms-durable-subscription-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java b/examples/jms/durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/DurableSubscriptionExample.java
similarity index 97%
rename from examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java
rename to examples/jms/durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/DurableSubscriptionExample.java
index 92742585af..7f5cc1b076 100644
--- a/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java
+++ b/examples/jms/durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/DurableSubscriptionExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Topic;
 import javax.jms.TopicSubscriber;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that shows how to use a durable subscription.
diff --git a/examples/jms/durable-subscription/src/main/resources/jndi.properties b/examples/jms/durable-subscription/src/main/resources/jndi.properties
index 09611dc302..560b0cbb83 100644
--- a/examples/jms/durable-subscription/src/main/resources/jndi.properties
+++ b/examples/jms/durable-subscription/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 topic.topic/exampleTopic=exampleTopic
diff --git a/examples/jms/embedded-simple/pom.xml b/examples/jms/embedded-simple/pom.xml
index 4a02908971..415b4cc4d7 100644
--- a/examples/jms/embedded-simple/pom.xml
+++ b/examples/jms/embedded-simple/pom.xml
@@ -24,27 +24,27 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-embedded-simple-example
+   artemis-jms-embedded-simple-example
    jar
    ActiveMQ Artemis JMS Simple Embedded Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
@@ -60,7 +60,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         runClient
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-embedded-simple-example
+                        artemis-jms-embedded-simple-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
similarity index 88%
rename from examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
rename to examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
index 838c3fd6bb..98fc8b290c 100644
--- a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -28,12 +28,12 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.core.config.impl.SecurityConfiguration;
-import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.core.config.impl.SecurityConfiguration;
+import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
 
 /**
  * This example demonstrates how to run a ActiveMQ embedded with JMS
diff --git a/examples/jms/embedded/pom.xml b/examples/jms/embedded/pom.xml
index 78ac744f00..28dd040df6 100644
--- a/examples/jms/embedded/pom.xml
+++ b/examples/jms/embedded/pom.xml
@@ -24,27 +24,27 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-embedded-example
+   artemis-jms-embedded-example
    jar
    ActiveMQ Artemis JMS Embedded Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
@@ -60,7 +60,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         runClient
@@ -89,27 +89,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-embedded-example
+                        artemis-jms-embedded-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java b/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
similarity index 81%
rename from examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
rename to examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
index a2776d9d3b..35cfe5c4a1 100644
--- a/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -27,19 +27,19 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.jms.server.config.JMSQueueConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl;
-import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
+import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
 
 /**
  * This example demonstrates how to run a ActiveMQ embedded with JMS
diff --git a/examples/jms/expiry/pom.xml b/examples/jms/expiry/pom.xml
index e83fec658c..f5713c0534 100644
--- a/examples/jms/expiry/pom.xml
+++ b/examples/jms/expiry/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-expiry-example
+   artemis-jms-expiry-example
    jar
    ActiveMQ Artemis JMS Expiry Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -88,27 +88,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-expiry-example
+                        artemis-jms-expiry-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java b/examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java
similarity index 97%
rename from examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java
rename to examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java
index 56f8def202..743efec7b6 100644
--- a/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java
+++ b/examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example showing how messages are moved to an expiry queue when they expire.
diff --git a/examples/jms/expiry/src/main/resources/jndi.properties b/examples/jms/expiry/src/main/resources/jndi.properties
index 91e4c81451..00a4ce5c68 100644
--- a/examples/jms/expiry/src/main/resources/jndi.properties
+++ b/examples/jms/expiry/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
 queue.queue/expiryQueue=expiryQueue
diff --git a/examples/jms/ha-policy-autobackup/pom.xml b/examples/jms/ha-policy-autobackup/pom.xml
index 967207ce8e..b750ad23aa 100644
--- a/examples/jms/ha-policy-autobackup/pom.xml
+++ b/examples/jms/ha-policy-autobackup/pom.xml
@@ -24,7 +24,7 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
    ha-policy-autobackup
@@ -34,7 +34,7 @@ under the License.
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -129,22 +129,22 @@ under the License.
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java b/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java
similarity index 93%
rename from examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java
rename to examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java
index 86b6f985dd..a2b43a20d6 100644
--- a/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java
+++ b/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,12 +27,12 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClusterTopologyListener;
-import org.apache.activemq.api.core.client.TopologyMember;
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.jms.client.ActiveMQConnection;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener;
+import org.apache.activemq.artemis.api.core.client.TopologyMember;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/examples/jms/http-transport/pom.xml b/examples/jms/http-transport/pom.xml
index 1ac41d9c41..71e62e79a3 100644
--- a/examples/jms/http-transport/pom.xml
+++ b/examples/jms/http-transport/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-http-transport-example
+   artemis-jms-http-transport-example
    jar
    ActiveMQ Artemis JMS Http Transport Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -88,27 +88,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-http-transport-example
+                        artemis-jms-http-transport-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java b/examples/jms/http-transport/src/main/java/org/apache/activemq/artemis/jms/example/HttpTransportExample.java
similarity index 96%
rename from examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java
rename to examples/jms/http-transport/src/main/java/org/apache/activemq/artemis/jms/example/HttpTransportExample.java
index 6477b6b6f9..5949457cce 100644
--- a/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java
+++ b/examples/jms/http-transport/src/main/java/org/apache/activemq/artemis/jms/example/HttpTransportExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Queue example that uses HTTP protocol.
diff --git a/examples/jms/http-transport/src/main/resources/jndi.properties b/examples/jms/http-transport/src/main/resources/jndi.properties
index 7bc4a11be6..939589a163 100644
--- a/examples/jms/http-transport/src/main/resources/jndi.properties
+++ b/examples/jms/http-transport/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:8080?http-enabled=true
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/instantiate-connection-factory/pom.xml b/examples/jms/instantiate-connection-factory/pom.xml
index a063063136..1493eb1ebe 100644
--- a/examples/jms/instantiate-connection-factory/pom.xml
+++ b/examples/jms/instantiate-connection-factory/pom.xml
@@ -24,27 +24,27 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-instantiate-connection-factory-example
+   artemis-jms-instantiate-connection-factory-example
    jar
    ActiveMQ Artemis JMS Instantiate Connection Factory Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
@@ -60,7 +60,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -98,27 +98,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-instantiate-connection-factory-example
+                        artemis-jms-instantiate-connection-factory-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java b/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/artemis/jms/example/InstantiateConnectionFactoryExample.java
similarity index 88%
rename from examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java
rename to examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/artemis/jms/example/InstantiateConnectionFactoryExample.java
index c7febed99c..51d22692ad 100644
--- a/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java
+++ b/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/artemis/jms/example/InstantiateConnectionFactoryExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,12 +27,12 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
 
 /**
  *
diff --git a/examples/jms/interceptor/pom.xml b/examples/jms/interceptor/pom.xml
index 4524f9c67c..4aa6c42438 100644
--- a/examples/jms/interceptor/pom.xml
+++ b/examples/jms/interceptor/pom.xml
@@ -24,22 +24,22 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-interceptor-example
+   artemis-jms-interceptor-example
    jar
    ActiveMQ Artemis JMS Interceptor Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
@@ -55,7 +55,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -93,27 +93,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-interceptor-example
+                        artemis-jms-interceptor-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java b/examples/jms/interceptor/src/main/java/org/apache/activemq/artemis/jms/example/InterceptorExample.java
similarity index 96%
rename from examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java
rename to examples/jms/interceptor/src/main/java/org/apache/activemq/artemis/jms/example/InterceptorExample.java
index 0a56600d45..75e2937727 100644
--- a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java
+++ b/examples/jms/interceptor/src/main/java/org/apache/activemq/artemis/jms/example/InterceptorExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that shows how to implement and use interceptors with ActiveMQ.
diff --git a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java b/examples/jms/interceptor/src/main/java/org/apache/activemq/artemis/jms/example/SimpleInterceptor.java
similarity index 77%
rename from examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java
rename to examples/jms/interceptor/src/main/java/org/apache/activemq/artemis/jms/example/SimpleInterceptor.java
index 7043164a94..b0f9b1ca1a 100644
--- a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java
+++ b/examples/jms/interceptor/src/main/java/org/apache/activemq/artemis/jms/example/SimpleInterceptor.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 /**
  * A simple Interceptor implementation
diff --git a/examples/jms/interceptor/src/main/resources/jndi.properties b/examples/jms/interceptor/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/interceptor/src/main/resources/jndi.properties
+++ b/examples/jms/interceptor/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/jms-auto-closeable/pom.xml b/examples/jms/jms-auto-closeable/pom.xml
index cacecb7f2f..2348f36d30 100644
--- a/examples/jms/jms-auto-closeable/pom.xml
+++ b/examples/jms/jms-auto-closeable/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-auto-closeable-example
+   artemis-jms-auto-closeable-example
    jar
    ActiveMQ Artemis JMS Auto Closable Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-auto-closeable-example
+                        artemis-jms-auto-closeable-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/jms/example/JMSAutoCloseableExample.java b/examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/artemis/jms/example/JMSAutoCloseableExample.java
similarity index 96%
rename from examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/jms/example/JMSAutoCloseableExample.java
rename to examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/artemis/jms/example/JMSAutoCloseableExample.java
index 2d60d00ed7..d7508ccb6f 100644
--- a/examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/jms/example/JMSAutoCloseableExample.java
+++ b/examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/artemis/jms/example/JMSAutoCloseableExample.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.*;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that shows how AutoCloseable is used by JMS 2 resources.
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties b/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties
+++ b/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/jms-bridge/pom.xml b/examples/jms/jms-bridge/pom.xml
index c727f90acc..63588f43e5 100644
--- a/examples/jms/jms-bridge/pom.xml
+++ b/examples/jms/jms-bridge/pom.xml
@@ -24,22 +24,22 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-jms-bridge-example
+   artemis-jms-jms-bridge-example
    jar
    ActiveMQ Artemis JMS Bridge Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
@@ -55,7 +55,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -117,27 +117,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-jms-bridge-example
+                        artemis-jms-jms-bridge-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java b/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java
similarity index 94%
rename from examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java
rename to examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java
index d0dfd2f73f..b2a92e3681 100644
--- a/examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java
+++ b/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
-import org.apache.activemq.jms.bridge.JMSBridge;
-import org.apache.activemq.jms.bridge.QualityOfServiceMode;
-import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl;
-import org.apache.activemq.jms.bridge.impl.JNDIConnectionFactoryFactory;
-import org.apache.activemq.jms.bridge.impl.JNDIDestinationFactory;
+import org.apache.activemq.artemis.jms.bridge.JMSBridge;
+import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode;
+import org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl;
+import org.apache.activemq.artemis.jms.bridge.impl.JNDIConnectionFactoryFactory;
+import org.apache.activemq.artemis.jms.bridge.impl.JNDIDestinationFactory;
 
 import java.util.Hashtable;
 
diff --git a/examples/jms/jms-completion-listener/pom.xml b/examples/jms/jms-completion-listener/pom.xml
index aef1698050..787dd77152 100644
--- a/examples/jms/jms-completion-listener/pom.xml
+++ b/examples/jms/jms-completion-listener/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-completion-listener-example
+   artemis-jms-completion-listener-example
    jar
    ActiveMQ Artemis JMS Completion Listener Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-completion-listener-example
+                        artemis-jms-completion-listener-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/jms/example/JMSCompletionListenerExample.java b/examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/artemis/jms/example/JMSCompletionListenerExample.java
similarity index 96%
rename from examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/jms/example/JMSCompletionListenerExample.java
rename to examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/artemis/jms/example/JMSCompletionListenerExample.java
index 7b2b1089f2..929a1557b6 100644
--- a/examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/jms/example/JMSCompletionListenerExample.java
+++ b/examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/artemis/jms/example/JMSCompletionListenerExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.CompletionListener;
 import javax.jms.ConnectionFactory;
@@ -24,7 +24,7 @@ import javax.jms.Message;
 import javax.jms.Queue;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/examples/jms/jms-completion-listener/src/main/resources/jndi.properties b/examples/jms/jms-completion-listener/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/jms-completion-listener/src/main/resources/jndi.properties
+++ b/examples/jms/jms-completion-listener/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/jms-context/pom.xml b/examples/jms/jms-context/pom.xml
index b751012445..3fa2f40b47 100644
--- a/examples/jms/jms-context/pom.xml
+++ b/examples/jms/jms-context/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-context-example
+   artemis-jms-context-example
    jar
    ActiveMQ Artemis JMS Context Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-context-example
+                        artemis-jms-context-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/jms-context/src/main/java/org/apache/activemq/jms/example/JMSContextExample.java b/examples/jms/jms-context/src/main/java/org/apache/activemq/artemis/jms/example/JMSContextExample.java
similarity index 95%
rename from examples/jms/jms-context/src/main/java/org/apache/activemq/jms/example/JMSContextExample.java
rename to examples/jms/jms-context/src/main/java/org/apache/activemq/artemis/jms/example/JMSContextExample.java
index e888426b02..71344f66ca 100644
--- a/examples/jms/jms-context/src/main/java/org/apache/activemq/jms/example/JMSContextExample.java
+++ b/examples/jms/jms-context/src/main/java/org/apache/activemq/artemis/jms/example/JMSContextExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.DeliveryMode;
@@ -22,7 +22,7 @@ import javax.jms.JMSContext;
 import javax.jms.Queue;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message.
diff --git a/examples/jms/jms-context/src/main/resources/jndi.properties b/examples/jms/jms-context/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/jms-context/src/main/resources/jndi.properties
+++ b/examples/jms/jms-context/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/jms-shared-consumer/pom.xml b/examples/jms/jms-shared-consumer/pom.xml
index abc3c49d5c..36b75035ed 100644
--- a/examples/jms/jms-shared-consumer/pom.xml
+++ b/examples/jms/jms-shared-consumer/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-shared-consumer-example
+   artemis-jms-shared-consumer-example
    jar
    ActiveMQ Artemis JMS Shared Consumer Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -88,27 +88,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-shared-consumer-example
+                        artemis-jms-shared-consumer-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/jms/example/JMSSharedConsumerExample.java b/examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/artemis/jms/example/JMSSharedConsumerExample.java
similarity index 94%
rename from examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/jms/example/JMSSharedConsumerExample.java
rename to examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/artemis/jms/example/JMSSharedConsumerExample.java
index f394d9a1dd..ea519097a7 100644
--- a/examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/jms/example/JMSSharedConsumerExample.java
+++ b/examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/artemis/jms/example/JMSSharedConsumerExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.CompletionListener;
 import javax.jms.ConnectionFactory;
@@ -26,10 +26,7 @@ import javax.jms.Queue;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A JMS Example that uses shared consumers.
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties b/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties
index 09611dc302..560b0cbb83 100644
--- a/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties
+++ b/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 topic.topic/exampleTopic=exampleTopic
diff --git a/examples/jms/jmx/pom.xml b/examples/jms/jmx/pom.xml
index 8eb21eabd9..626209b967 100644
--- a/examples/jms/jmx/pom.xml
+++ b/examples/jms/jmx/pom.xml
@@ -24,27 +24,27 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-jmx-example
+   artemis-jms-jmx-example
    jar
    ActiveMQ Artemis JMS "JMX" Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
@@ -60,7 +60,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -113,27 +113,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-jmx-example
+                        artemis-jms-jmx-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/jmx/src/main/java/org/apache/activemq/jms/example/JMXExample.java b/examples/jms/jmx/src/main/java/org/apache/activemq/artemis/jms/example/JMXExample.java
similarity index 95%
rename from examples/jms/jmx/src/main/java/org/apache/activemq/jms/example/JMXExample.java
rename to examples/jms/jmx/src/main/java/org/apache/activemq/artemis/jms/example/JMXExample.java
index b88402c48e..96d9874c03 100644
--- a/examples/jms/jmx/src/main/java/org/apache/activemq/jms/example/JMXExample.java
+++ b/examples/jms/jmx/src/main/java/org/apache/activemq/artemis/jms/example/JMXExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.HashMap;
 
@@ -34,9 +34,9 @@ import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.jms.management.JMSQueueControl;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example that shows how to manage ActiveMQ using JMX.
diff --git a/examples/jms/jmx/src/main/resources/jndi.properties b/examples/jms/jmx/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/jmx/src/main/resources/jndi.properties
+++ b/examples/jms/jmx/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/large-message/pom.xml b/examples/jms/large-message/pom.xml
index 7a554fc42b..b4be070613 100644
--- a/examples/jms/large-message/pom.xml
+++ b/examples/jms/large-message/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-large-message-example
+   artemis-jms-large-message-example
    jar
    ActiveMQ Artemis JMS Large Message Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -91,27 +91,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-large-message-example
+                        artemis-jms-large-message-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/large-message/src/main/java/org/apache/activemq/jms/example/LargeMessageExample.java b/examples/jms/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
similarity index 98%
rename from examples/jms/large-message/src/main/java/org/apache/activemq/jms/example/LargeMessageExample.java
rename to examples/jms/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
index 89309eb614..ee4b6d1bc3 100644
--- a/examples/jms/large-message/src/main/java/org/apache/activemq/jms/example/LargeMessageExample.java
+++ b/examples/jms/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -33,7 +33,7 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates the ability of ActiveMQ to send and consume a very large message, much
diff --git a/examples/jms/large-message/src/main/resources/jndi.properties b/examples/jms/large-message/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/large-message/src/main/resources/jndi.properties
+++ b/examples/jms/large-message/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/last-value-queue/pom.xml b/examples/jms/last-value-queue/pom.xml
index bf54cf6988..d8085dec23 100644
--- a/examples/jms/last-value-queue/pom.xml
+++ b/examples/jms/last-value-queue/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-last-value-queue-example
+   artemis-jms-last-value-queue-example
    jar
    ActiveMQ Artemis JMS Last Value Queue Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-last-value-queue-example
+                        artemis-jms-last-value-queue-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/last-value-queue/src/main/java/org/apache/activemq/jms/example/LastValueQueueExample.java b/examples/jms/last-value-queue/src/main/java/org/apache/activemq/artemis/jms/example/LastValueQueueExample.java
similarity index 97%
rename from examples/jms/last-value-queue/src/main/java/org/apache/activemq/jms/example/LastValueQueueExample.java
rename to examples/jms/last-value-queue/src/main/java/org/apache/activemq/artemis/jms/example/LastValueQueueExample.java
index e5504ba4f9..5b1719ed8f 100644
--- a/examples/jms/last-value-queue/src/main/java/org/apache/activemq/jms/example/LastValueQueueExample.java
+++ b/examples/jms/last-value-queue/src/main/java/org/apache/activemq/artemis/jms/example/LastValueQueueExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Enumeration;
 
@@ -28,7 +28,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example shows how to configure and use a Last-Value queues.
diff --git a/examples/jms/last-value-queue/src/main/resources/jndi.properties b/examples/jms/last-value-queue/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/last-value-queue/src/main/resources/jndi.properties
+++ b/examples/jms/last-value-queue/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/management-notifications/pom.xml b/examples/jms/management-notifications/pom.xml
index a926175f6c..3dda29805a 100644
--- a/examples/jms/management-notifications/pom.xml
+++ b/examples/jms/management-notifications/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-management-notifications-example
+   artemis-jms-management-notifications-example
    jar
    ActiveMQ Artemis JMS Management Notifications Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-management-notifications-example
+                        artemis-jms-management-notifications-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/management-notifications/src/main/java/org/apache/activemq/jms/example/ManagementNotificationExample.java b/examples/jms/management-notifications/src/main/java/org/apache/activemq/artemis/jms/example/ManagementNotificationExample.java
similarity index 97%
rename from examples/jms/management-notifications/src/main/java/org/apache/activemq/jms/example/ManagementNotificationExample.java
rename to examples/jms/management-notifications/src/main/java/org/apache/activemq/artemis/jms/example/ManagementNotificationExample.java
index 23c2a4a957..a9515e2bdc 100644
--- a/examples/jms/management-notifications/src/main/java/org/apache/activemq/jms/example/ManagementNotificationExample.java
+++ b/examples/jms/management-notifications/src/main/java/org/apache/activemq/artemis/jms/example/ManagementNotificationExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Enumeration;
 
@@ -30,7 +30,7 @@ import javax.jms.Session;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example that shows how to receive management notifications using JMS messages.
diff --git a/examples/jms/management-notifications/src/main/resources/jndi.properties b/examples/jms/management-notifications/src/main/resources/jndi.properties
index 474a7c3141..230b95f3b1 100644
--- a/examples/jms/management-notifications/src/main/resources/jndi.properties
+++ b/examples/jms/management-notifications/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
 topic.topic/notificationsTopic=notificationsTopic
diff --git a/examples/jms/management/pom.xml b/examples/jms/management/pom.xml
index 38e30d4702..36722846b7 100644
--- a/examples/jms/management/pom.xml
+++ b/examples/jms/management/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-management-example
+   artemis-jms-management-example
    jar
    ActiveMQ Artemis JMS Management Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-management-example
+                        artemis-jms-management-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/management/src/main/java/org/apache/activemq/jms/example/ManagementExample.java b/examples/jms/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
similarity index 96%
rename from examples/jms/management/src/main/java/org/apache/activemq/jms/example/ManagementExample.java
rename to examples/jms/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
index 8b8dc46479..3d062963d0 100644
--- a/examples/jms/management/src/main/java/org/apache/activemq/jms/example/ManagementExample.java
+++ b/examples/jms/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
@@ -28,9 +28,9 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.management.JMSManagementHelper;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example that shows how to manage ActiveMQ using JMS messages.
diff --git a/examples/jms/management/src/main/resources/jndi.properties b/examples/jms/management/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/management/src/main/resources/jndi.properties
+++ b/examples/jms/management/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/message-counters/pom.xml b/examples/jms/message-counters/pom.xml
index 47f8ec6766..3f78368032 100644
--- a/examples/jms/message-counters/pom.xml
+++ b/examples/jms/message-counters/pom.xml
@@ -24,22 +24,22 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-message-counters-example
+   artemis-jms-message-counters-example
    jar
    ActiveMQ Artemis JMS Message Counter Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
       
@@ -55,7 +55,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -108,27 +108,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-message-counters-example
+                        artemis-jms-message-counters-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java b/examples/jms/message-counters/src/main/java/org/apache/activemq/artemis/jms/example/MessageCounterExample.java
similarity index 95%
rename from examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java
rename to examples/jms/message-counters/src/main/java/org/apache/activemq/artemis/jms/example/MessageCounterExample.java
index 2b4dcf9a00..14fde72118 100644
--- a/examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java
+++ b/examples/jms/message-counters/src/main/java/org/apache/activemq/artemis/jms/example/MessageCounterExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.HashMap;
 
@@ -34,10 +34,10 @@ import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.management.MessageCounterInfo;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.jms.management.JMSQueueControl;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.core.management.MessageCounterInfo;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example showing how to use message counters to have information on a queue.
diff --git a/examples/jms/message-counters/src/main/resources/jndi.properties b/examples/jms/message-counters/src/main/resources/jndi.properties
index 91e4c81451..00a4ce5c68 100644
--- a/examples/jms/message-counters/src/main/resources/jndi.properties
+++ b/examples/jms/message-counters/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
 queue.queue/expiryQueue=expiryQueue
diff --git a/examples/jms/message-group/pom.xml b/examples/jms/message-group/pom.xml
index 92f84292a0..6c8f168298 100644
--- a/examples/jms/message-group/pom.xml
+++ b/examples/jms/message-group/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-message-group-example
+   artemis-jms-message-group-example
    jar
    ActiveMQ Artemis JMS Message Group Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-message-group-example
+                        artemis-jms-message-group-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java b/examples/jms/message-group/src/main/java/org/apache/activemq/artemis/jms/example/MessageGroupExample.java
similarity index 97%
rename from examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java
rename to examples/jms/message-group/src/main/java/org/apache/activemq/artemis/jms/example/MessageGroupExample.java
index bf9c16ddb0..859ea5f9d5 100644
--- a/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java
+++ b/examples/jms/message-group/src/main/java/org/apache/activemq/artemis/jms/example/MessageGroupExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -31,7 +31,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Queue example that sends and receives message groups.
diff --git a/examples/jms/message-group/src/main/resources/jndi.properties b/examples/jms/message-group/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/message-group/src/main/resources/jndi.properties
+++ b/examples/jms/message-group/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/message-group2/pom.xml b/examples/jms/message-group2/pom.xml
index 21dd909609..922e0f2937 100644
--- a/examples/jms/message-group2/pom.xml
+++ b/examples/jms/message-group2/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-message-group2-example
+   artemis-jms-message-group2-example
    jar
    ActiveMQ Artemis JMS Message Group Example 2
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-message-group2-example
+                        artemis-jms-message-group2-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java b/examples/jms/message-group2/src/main/java/org/apache/activemq/artemis/jms/example/MessageGroup2Example.java
similarity index 97%
rename from examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java
rename to examples/jms/message-group2/src/main/java/org/apache/activemq/artemis/jms/example/MessageGroup2Example.java
index 30c75a5109..20ed2c277d 100644
--- a/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java
+++ b/examples/jms/message-group2/src/main/java/org/apache/activemq/artemis/jms/example/MessageGroup2Example.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -31,7 +31,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Queue example that sends and receives message groups.
diff --git a/examples/jms/message-group2/src/main/resources/jndi.properties b/examples/jms/message-group2/src/main/resources/jndi.properties
index 3e289a03f6..9108d84975 100644
--- a/examples/jms/message-group2/src/main/resources/jndi.properties
+++ b/examples/jms/message-group2/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?groupID=Group-0
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/message-priority/pom.xml b/examples/jms/message-priority/pom.xml
index c4be9438bb..6cb4f6459d 100644
--- a/examples/jms/message-priority/pom.xml
+++ b/examples/jms/message-priority/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-message-priority-example
+   artemis-jms-message-priority-example
    jar
    ActiveMQ Artemis JMS MessagePriorityExample Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-message-priority-example
+                        artemis-jms-message-priority-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java b/examples/jms/message-priority/src/main/java/org/apache/activemq/artemis/jms/example/MessagePriorityExample.java
similarity index 97%
rename from examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java
rename to examples/jms/message-priority/src/main/java/org/apache/activemq/artemis/jms/example/MessagePriorityExample.java
index 5ce815f17d..5491fad3f5 100644
--- a/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java
+++ b/examples/jms/message-priority/src/main/java/org/apache/activemq/artemis/jms/example/MessagePriorityExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.ArrayList;
 
@@ -31,7 +31,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that shows the delivery order of messages with priorities.
diff --git a/examples/jms/message-priority/src/main/resources/jndi.properties b/examples/jms/message-priority/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/message-priority/src/main/resources/jndi.properties
+++ b/examples/jms/message-priority/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/multiple-failover-failback/pom.xml b/examples/jms/multiple-failover-failback/pom.xml
index e376a078de..591c5612f2 100644
--- a/examples/jms/multiple-failover-failback/pom.xml
+++ b/examples/jms/multiple-failover-failback/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-multiple-failover-failback-example
+   artemis-jms-multiple-failover-failback-example
    jar
    ActiveMQ Artemis JMS Multiple Failover Failback Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -157,27 +157,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-multiple-failover-failback-example
+                        artemis-jms-multiple-failover-failback-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java b/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/artemis/jms/example/MultipleFailoverFailbackExample.java
similarity index 97%
rename from examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java
rename to examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/artemis/jms/example/MultipleFailoverFailbackExample.java
index 36e7475937..4a5731d255 100644
--- a/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java
+++ b/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/artemis/jms/example/MultipleFailoverFailbackExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 public class MultipleFailoverFailbackExample extends ActiveMQExample
 {
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties b/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
index 0dac60eed0..07c84f2410 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
+++ b/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/multiple-failover/pom.xml b/examples/jms/multiple-failover/pom.xml
index e06f2f6ee2..92e521de0d 100644
--- a/examples/jms/multiple-failover/pom.xml
+++ b/examples/jms/multiple-failover/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-multiple-failover-example
+   artemis-jms-multiple-failover-example
    jar
    ActiveMQ Artemis JMS Multiple Failover Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -157,27 +157,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-multiple-failover-example
+                        artemis-jms-multiple-failover-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java b/examples/jms/multiple-failover/src/main/java/org/apache/activemq/artemis/jms/example/MultipleFailoverExample.java
similarity index 97%
rename from examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java
rename to examples/jms/multiple-failover/src/main/java/org/apache/activemq/artemis/jms/example/MultipleFailoverExample.java
index cfbeda4566..a888d9ad9f 100644
--- a/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java
+++ b/examples/jms/multiple-failover/src/main/java/org/apache/activemq/artemis/jms/example/MultipleFailoverExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 public class MultipleFailoverExample extends ActiveMQExample
 {
diff --git a/examples/jms/multiple-failover/src/main/resources/jndi.properties b/examples/jms/multiple-failover/src/main/resources/jndi.properties
index 0dac60eed0..07c84f2410 100644
--- a/examples/jms/multiple-failover/src/main/resources/jndi.properties
+++ b/examples/jms/multiple-failover/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/no-consumer-buffering/pom.xml b/examples/jms/no-consumer-buffering/pom.xml
index 8e4704bc02..16f5d78c8b 100644
--- a/examples/jms/no-consumer-buffering/pom.xml
+++ b/examples/jms/no-consumer-buffering/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-no-consumer-buffering-example
+   artemis-jms-no-consumer-buffering-example
    jar
    ActiveMQ Artemis JMS No Consumer Buffering Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-no-consumer-buffering-example
+                        artemis-jms-no-consumer-buffering-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/artemis/jms/example/NoConsumerBufferingExample.java
similarity index 97%
rename from examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java
rename to examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/artemis/jms/example/NoConsumerBufferingExample.java
index 9cbcf3c927..a5588f4d06 100644
--- a/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java
+++ b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/artemis/jms/example/NoConsumerBufferingExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates how ActiveMQ consumers can be configured to not buffer any messages from
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties b/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties
index 85078717e5..fdc5940f2e 100644
--- a/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties
+++ b/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?consumerWindowSize=0
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/non-transaction-failover/pom.xml b/examples/jms/non-transaction-failover/pom.xml
index 7c3defc489..41e79b91b1 100644
--- a/examples/jms/non-transaction-failover/pom.xml
+++ b/examples/jms/non-transaction-failover/pom.xml
@@ -24,7 +24,7 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
    non-transaction-failover
@@ -34,7 +34,7 @@ under the License.
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -133,22 +133,22 @@ under the License.
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java b/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/NonTransactionFailoverExample.java
similarity index 97%
rename from examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java
rename to examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/NonTransactionFailoverExample.java
index 39cdb154e7..1398246bad 100644
--- a/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java
+++ b/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/NonTransactionFailoverExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates failover of the JMS connection from one node to another
diff --git a/examples/jms/non-transaction-failover/src/main/resources/jndi.properties b/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
index 0dac60eed0..07c84f2410 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
+++ b/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/openwire/pom.xml b/examples/jms/openwire/pom.xml
index 82f9db7624..92738bbab5 100644
--- a/examples/jms/openwire/pom.xml
+++ b/examples/jms/openwire/pom.xml
@@ -24,10 +24,10 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-openwire-example
+   artemis-jms-openwire-example
    jar
    ActiveMQ Artemis JMS Openwire Example
 
@@ -38,7 +38,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -73,32 +73,32 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-openwire-example
+                        artemis-jms-openwire-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-openwire-protocol
+                        artemis-openwire-protocol
                         ${project.version}
                      
                      
@@ -124,7 +124,7 @@ under the License.
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
diff --git a/examples/jms/openwire/src/main/java/org/apache/activemq/jms/example/OpenWireExample.java b/examples/jms/openwire/src/main/java/org/apache/activemq/artemis/jms/example/OpenWireExample.java
similarity index 96%
rename from examples/jms/openwire/src/main/java/org/apache/activemq/jms/example/OpenWireExample.java
rename to examples/jms/openwire/src/main/java/org/apache/activemq/artemis/jms/example/OpenWireExample.java
index f089704b8e..59eb72c197 100644
--- a/examples/jms/openwire/src/main/java/org/apache/activemq/jms/example/OpenWireExample.java
+++ b/examples/jms/openwire/src/main/java/org/apache/activemq/artemis/jms/example/OpenWireExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Queue example that creates a producer and consumer on a queue
diff --git a/examples/jms/paging/pom.xml b/examples/jms/paging/pom.xml
index f15cdeb557..49c5e32756 100644
--- a/examples/jms/paging/pom.xml
+++ b/examples/jms/paging/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-paging-example
+   artemis-jms-paging-example
    jar
    ActiveMQ Artemis JMS Paging Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-paging-example
+                        artemis-jms-paging-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java b/examples/jms/paging/src/main/java/org/apache/activemq/artemis/jms/example/PagingExample.java
similarity index 97%
rename from examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java
rename to examples/jms/paging/src/main/java/org/apache/activemq/artemis/jms/example/PagingExample.java
index 56bf905e2a..becef16d00 100644
--- a/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java
+++ b/examples/jms/paging/src/main/java/org/apache/activemq/artemis/jms/example/PagingExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -26,7 +26,7 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message.
diff --git a/examples/jms/paging/src/main/resources/jndi.properties b/examples/jms/paging/src/main/resources/jndi.properties
index 8855e7ec5a..5ce6ed4e8e 100644
--- a/examples/jms/paging/src/main/resources/jndi.properties
+++ b/examples/jms/paging/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
 queue.queue/pagingQueue=pagingQueue
diff --git a/examples/jms/perf/pom.xml b/examples/jms/perf/pom.xml
index 5eebd072c0..f3afbff9e1 100644
--- a/examples/jms/perf/pom.xml
+++ b/examples/jms/perf/pom.xml
@@ -24,22 +24,22 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-perf-example
+   artemis-jms-perf-example
    jar
    ActiveMQ Artemis JMS PerfExample Example
 
    
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-commons
+         artemis-commons
          ${project.version}
       
       
@@ -53,7 +53,7 @@ under the License.
       
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
    
@@ -65,7 +65,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -91,27 +91,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-perf-example
+                        artemis-jms-perf-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java b/examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfBase.java
similarity index 98%
rename from examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java
rename to examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfBase.java
index df768ec8ef..29ae9b9959 100644
--- a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java
+++ b/examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -27,8 +27,8 @@ import java.util.logging.Logger;
 import javax.jms.*;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.utils.TokenBucketLimiter;
-import org.apache.activemq.utils.TokenBucketLimiterImpl;
+import org.apache.activemq.artemis.utils.TokenBucketLimiter;
+import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl;
 
 public abstract class PerfBase
 {
diff --git a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java b/examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfListener.java
similarity index 96%
rename from examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java
rename to examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfListener.java
index ca4b04a29c..7ada00024f 100644
--- a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java
+++ b/examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.logging.Logger;
 
diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfParams.java b/examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfParams.java
similarity index 98%
rename from examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfParams.java
rename to examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfParams.java
index 309bdaa902..bb8e97125b 100644
--- a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfParams.java
+++ b/examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfParams.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.io.Serializable;
 
diff --git a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java b/examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfSender.java
similarity index 96%
rename from examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java
rename to examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfSender.java
index 54473e18b2..6510ee2db0 100644
--- a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java
+++ b/examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfSender.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.logging.Logger;
 
diff --git a/examples/jms/perf/src/main/resources/jndi.properties b/examples/jms/perf/src/main/resources/jndi.properties
index d13d7ebf11..3d1a38f21e 100644
--- a/examples/jms/perf/src/main/resources/jndi.properties
+++ b/examples/jms/perf/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?tcp-no-delay=false&tcp-send-buffer-size=1048576&tcp-receive-buffer-size=1048576
 queue.perfQueue=perfQueue
diff --git a/examples/jms/pom.xml b/examples/jms/pom.xml
index 872589ce54..e16c82f17e 100644
--- a/examples/jms/pom.xml
+++ b/examples/jms/pom.xml
@@ -23,8 +23,8 @@ under the License.
 
    
       org.apache.activemq.examples
-      activemq-examples
-      10.0.0-SNAPSHOT
+      artemis-examples
+      1.0.0-SNAPSHOT
    
 
    org.apache.activemq.examples.jms
@@ -41,8 +41,8 @@ under the License.
          release
          
             aerogear
-            activemq-jms-examples-common
-            activemq-ra-rar
+            artemis-jms-examples-common
+            artemis-ra-rar
             application-layer-failover
             bridge
             browser
@@ -140,7 +140,7 @@ under the License.
             true
          
          
-            activemq-jms-examples-common
+            artemis-jms-examples-common
             application-layer-failover
             bridge
             browser
diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml
index c2f0a6ef51..e96d6588e3 100644
--- a/examples/jms/pre-acknowledge/pom.xml
+++ b/examples/jms/pre-acknowledge/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-pre-acknowledge-example
+   artemis-jms-pre-acknowledge-example
    jar
    ActiveMQ Artemis JMS Pre Acknowledge Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -88,27 +88,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-pre-acknowledge-example
+                        artemis-jms-pre-acknowledge-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java
similarity index 93%
rename from examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java
rename to examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java
index 945a4d13ec..1150007890 100644
--- a/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java
+++ b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -29,10 +29,10 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.ActiveMQJMSConstants;
-import org.apache.activemq.api.jms.management.JMSManagementHelper;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
+import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates the use of ActiveMQ "pre-acknowledge" functionality where
diff --git a/examples/jms/pre-acknowledge/src/main/resources/jndi.properties b/examples/jms/pre-acknowledge/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/jndi.properties
+++ b/examples/jms/pre-acknowledge/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/producer-rate-limit/pom.xml b/examples/jms/producer-rate-limit/pom.xml
index 4919c52d16..bdc85f705b 100644
--- a/examples/jms/producer-rate-limit/pom.xml
+++ b/examples/jms/producer-rate-limit/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-producer-rate-limit-example
+   artemis-jms-producer-rate-limit-example
    jar
    ActiveMQ Artemis JMS Producer Rate Limit Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-producer-rate-limit-example
+                        artemis-jms-producer-rate-limit-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java b/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/artemis/jms/example/ProducerRateLimitExample.java
similarity index 97%
rename from examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java
rename to examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/artemis/jms/example/ProducerRateLimitExample.java
index c60e4b1080..6fb24580f0 100644
--- a/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java
+++ b/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/artemis/jms/example/ProducerRateLimitExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates how a message producer can be limited to produce messages at a maximum rate
diff --git a/examples/jms/producer-rate-limit/src/main/resources/jndi.properties b/examples/jms/producer-rate-limit/src/main/resources/jndi.properties
index 297686b516..396f3fa263 100644
--- a/examples/jms/producer-rate-limit/src/main/resources/jndi.properties
+++ b/examples/jms/producer-rate-limit/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?producerMaxRate=50
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml
index 106b0e866b..abc8623d82 100644
--- a/examples/jms/proton-cpp/pom.xml
+++ b/examples/jms/proton-cpp/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-protoncpp
+   artemis-jms-protoncpp
    jar
    ActiveMQ Artemis AMQP CPP Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   ${project.version}
                   
                      
@@ -86,32 +86,32 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-protoncpp
+                        artemis-jms-protoncpp
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-amqp-protocol
+                        artemis-amqp-protocol
                         ${project.version}
                      
                      
diff --git a/examples/jms/proton-cpp/src/main/java/org/apache/activemq/jms/example/ProtonCPPExample.java b/examples/jms/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java
similarity index 92%
rename from examples/jms/proton-cpp/src/main/java/org/apache/activemq/jms/example/ProtonCPPExample.java
rename to examples/jms/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java
index 564d827e63..172e83ec48 100644
--- a/examples/jms/proton-cpp/src/main/java/org/apache/activemq/jms/example/ProtonCPPExample.java
+++ b/examples/jms/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -29,11 +29,11 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.ActiveMQJMSConstants;
-import org.apache.activemq.api.jms.management.JMSManagementHelper;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
+import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates the use of ActiveMQ "pre-acknowledge" functionality where
@@ -70,7 +70,7 @@ public class ProtonCPPExample extends ActiveMQExample
          Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
          MessageConsumer messageConsumer = session.createConsumer(queue);
-         
+
          MessageProducer producerAnswer = session.createProducer(queue);
 
          // Step 4. Start the connection
@@ -87,16 +87,16 @@ public class ProtonCPPExample extends ActiveMQExample
 
          if (messageReceived == null)
          {
-            // We are not going to issue this as an error because 
-            // we also use this example as part of our tests on activemq6
+            // We are not going to issue this as an error because
+            // we also use this example as part of our tests on artemis
             // this is not considered an error, just that no messages arrived (i.e. hello wasn't called)
          }
          else
          {
             System.out.println("message received: " + messageReceived);
-            
+
             // Sending message back to client
-            producerAnswer.send(session.createTextMessage("HELLO from Apache ActiveMQ"));
+            producerAnswer.send(session.createTextMessage("HELLO from Apache ActiveMQ Artemis"));
          }
 
          return true;
diff --git a/examples/jms/proton-cpp/src/main/resources/jndi.properties b/examples/jms/proton-cpp/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/proton-cpp/src/main/resources/jndi.properties
+++ b/examples/jms/proton-cpp/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml
index fac39d9933..b84f82f830 100644
--- a/examples/jms/proton-j/pom.xml
+++ b/examples/jms/proton-j/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-proton-j-example
+   artemis-proton-j-example
    jar
    ActiveMQ Artemis Proton-J Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -51,7 +51,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -89,32 +89,32 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-proton-j-example
+                        artemis-proton-j-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-amqp-protocol
+                        artemis-amqp-protocol
                         ${project.version}
                      
                      
diff --git a/examples/jms/proton-j/src/main/java/org/apache/activemq/jms/example/ProtonJExample.java b/examples/jms/proton-j/src/main/java/org/apache/activemq/artemis/jms/example/ProtonJExample.java
similarity index 95%
rename from examples/jms/proton-j/src/main/java/org/apache/activemq/jms/example/ProtonJExample.java
rename to examples/jms/proton-j/src/main/java/org/apache/activemq/artemis/jms/example/ProtonJExample.java
index 25e6be3f55..df0b0a0a16 100644
--- a/examples/jms/proton-j/src/main/java/org/apache/activemq/jms/example/ProtonJExample.java
+++ b/examples/jms/proton-j/src/main/java/org/apache/activemq/artemis/jms/example/ProtonJExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 
 import org.apache.qpid.amqp_1_0.client.Connection;
@@ -23,7 +23,7 @@ import org.apache.qpid.amqp_1_0.client.Receiver;
 import org.apache.qpid.amqp_1_0.client.Sender;
 import org.apache.qpid.amqp_1_0.client.Session;
 import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 public class ProtonJExample extends ActiveMQExample
 {
diff --git a/examples/jms/proton-ruby/pom.xml b/examples/jms/proton-ruby/pom.xml
index 4e59985084..a5a469e07b 100644
--- a/examples/jms/proton-ruby/pom.xml
+++ b/examples/jms/proton-ruby/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-proton-ruby-example
+   artemis-jms-proton-ruby-example
    jar
    ActiveMQ Artemis Proton Ruby Examplee
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
    
@@ -46,7 +46,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -67,32 +67,32 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-proton-ruby-example
+                        artemis-jms-proton-ruby-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-amqp-protocol
+                        artemis-amqp-protocol
                         ${project.version}
                      
                      
diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml
index b84836cfb9..b75e6ceb49 100644
--- a/examples/jms/queue-message-redistribution/pom.xml
+++ b/examples/jms/queue-message-redistribution/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-queue-message-redistribution-example
+   artemis-jms-queue-message-redistribution-example
    jar
    ActiveMQ Artemis JMS Queue Message Redistribution Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -132,27 +132,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-queue-message-redistribution-example
+                        artemis-jms-queue-message-redistribution-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java
similarity index 98%
rename from examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java
rename to examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java
index 213499de95..ed3f6e17a7 100644
--- a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java
+++ b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates a queue with the same name deployed on two nodes of a cluster.
diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml
index ebd2a8f4de..ef1688dcbe 100644
--- a/examples/jms/queue-requestor/pom.xml
+++ b/examples/jms/queue-requestor/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-queue-requestor-example
+   artemis-jms-queue-requestor-example
    jar
    ActiveMQ Artemis JMS Queue Requestor Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-queue-requestor-example
+                        artemis-jms-queue-requestor-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/QueueRequestorExample.java
similarity index 97%
rename from examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
rename to examples/jms/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/QueueRequestorExample.java
index d5f78d85ff..0878154123 100644
--- a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
+++ b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/QueueRequestorExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.JMSException;
 import javax.jms.Queue;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that shows how to use queues requestors.
diff --git a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/TextReverserService.java b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/TextReverserService.java
similarity index 98%
rename from examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/TextReverserService.java
rename to examples/jms/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/TextReverserService.java
index 635138aa39..9cc8a5a512 100644
--- a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/TextReverserService.java
+++ b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/TextReverserService.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
diff --git a/examples/jms/queue-requestor/src/main/resources/jndi.properties b/examples/jms/queue-requestor/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/queue-requestor/src/main/resources/jndi.properties
+++ b/examples/jms/queue-requestor/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml
index 15fd67587a..d81321218f 100644
--- a/examples/jms/queue-selector/pom.xml
+++ b/examples/jms/queue-selector/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-queue-selector-example
+   artemis-jms-queue-selector-example
    jar
    ActiveMQ Artemis JMS Queue Selector Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-queue-selector-example
+                        artemis-jms-queue-selector-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java b/examples/jms/queue-selector/src/main/java/org/apache/activemq/artemis/jms/example/QueueSelectorExample.java
similarity index 97%
rename from examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
rename to examples/jms/queue-selector/src/main/java/org/apache/activemq/artemis/jms/example/QueueSelectorExample.java
index cb99c33e10..337d354263 100644
--- a/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
+++ b/examples/jms/queue-selector/src/main/java/org/apache/activemq/artemis/jms/example/QueueSelectorExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -28,7 +28,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that uses selectors with queue consumers.
diff --git a/examples/jms/queue-selector/src/main/resources/jndi.properties b/examples/jms/queue-selector/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/queue-selector/src/main/resources/jndi.properties
+++ b/examples/jms/queue-selector/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml
index 90d6bfe8b6..5848d7e6e0 100644
--- a/examples/jms/queue/pom.xml
+++ b/examples/jms/queue/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-queue-example
+   artemis-jms-queue-example
    jar
    ActiveMQ Artemis JMS Queue Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   ${project.version}
                   
                      
@@ -86,27 +86,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-queue-example
+                        artemis-jms-queue-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java b/examples/jms/queue/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
similarity index 96%
rename from examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
rename to examples/jms/queue/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
index ff76323007..c785d409c0 100644
--- a/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
+++ b/examples/jms/queue/src/main/java/org/apache/activemq/artemis/jms/example/QueueExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message.
diff --git a/examples/jms/queue/src/main/resources/jndi.properties b/examples/jms/queue/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/queue/src/main/resources/jndi.properties
+++ b/examples/jms/queue/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml
index b54441a742..2154f7225a 100644
--- a/examples/jms/reattach-node/pom.xml
+++ b/examples/jms/reattach-node/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-reattach-node-example
+   artemis-jms-reattach-node-example
    jar
    ActiveMQ Artemis JMS Reattach Node Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -89,27 +89,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-reattach-node-example
+                        artemis-jms-reattach-node-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java b/examples/jms/reattach-node/src/main/java/org/apache/activemq/artemis/jms/example/ReattachExample.java
similarity index 95%
rename from examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
rename to examples/jms/reattach-node/src/main/java/org/apache/activemq/artemis/jms/example/ReattachExample.java
index 0b0c6062a3..b5c7705bf9 100644
--- a/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
+++ b/examples/jms/reattach-node/src/main/java/org/apache/activemq/artemis/jms/example/ReattachExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -28,9 +28,9 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.management.JMSManagementHelper;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This examples demonstrates a connection created to a server. Failure of the network connection is then simulated
diff --git a/examples/jms/reattach-node/src/main/resources/jndi.properties b/examples/jms/reattach-node/src/main/resources/jndi.properties
index fced747580..d3fc2ee5f0 100644
--- a/examples/jms/reattach-node/src/main/resources/jndi.properties
+++ b/examples/jms/reattach-node/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1&failoverOnServerShutdown=true&confirmationWindowSize=1048576
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml
index d91f3f2e1c..51b0a24b21 100644
--- a/examples/jms/replicated-failback-static/pom.xml
+++ b/examples/jms/replicated-failback-static/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-replicated-failback-static-example
+   artemis-jms-replicated-failback-static-example
    jar
    ActiveMQ Artemis JMS Replicated Failback Static Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -128,27 +128,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-replicated-failback-static-example
+                        artemis-jms-replicated-failback-static-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedFailbackStaticExample.java
similarity index 98%
rename from examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
rename to examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedFailbackStaticExample.java
index 536a52d07c..bf724a04b4 100644
--- a/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
+++ b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedFailbackStaticExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * Example of live and replicating backup pair.
diff --git a/examples/jms/replicated-failback-static/src/main/resources/jndi.properties b/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
index 0dac60eed0..07c84f2410 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/replicated-failback/pom.xml b/examples/jms/replicated-failback/pom.xml
index a00bb694b1..b77a3485b6 100644
--- a/examples/jms/replicated-failback/pom.xml
+++ b/examples/jms/replicated-failback/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-replicated-failback-example
+   artemis-jms-replicated-failback-example
    jar
    ActiveMQ Artemis JMS Replicated Failback Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -128,27 +128,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-replicated-failback-example
+                        artemis-jms-replicated-failback-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java b/examples/jms/replicated-failback/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedFailbackExample.java
similarity index 98%
rename from examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java
rename to examples/jms/replicated-failback/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedFailbackExample.java
index f8b975026e..5541cfd549 100644
--- a/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java
+++ b/examples/jms/replicated-failback/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedFailbackExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * Example of live and replicating backup pair.
diff --git a/examples/jms/replicated-failback/src/main/resources/jndi.properties b/examples/jms/replicated-failback/src/main/resources/jndi.properties
index 0dac60eed0..07c84f2410 100644
--- a/examples/jms/replicated-failback/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-failback/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/replicated-multiple-failover/pom.xml b/examples/jms/replicated-multiple-failover/pom.xml
index 51da774524..497c0e30b9 100644
--- a/examples/jms/replicated-multiple-failover/pom.xml
+++ b/examples/jms/replicated-multiple-failover/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-replicated-multiple-failover-example
+   artemis-jms-replicated-multiple-failover-example
    jar
    ActiveMQ Artemis JMS Replicated Multiple Failover Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -157,27 +157,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-replicated-multiple-failover-example
+                        artemis-jms-replicated-multiple-failover-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java b/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedMultipleFailoverExample.java
similarity index 97%
rename from examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java
rename to examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedMultipleFailoverExample.java
index 22dfb21145..04e4022a1d 100644
--- a/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java
+++ b/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedMultipleFailoverExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 public class ReplicatedMultipleFailoverExample extends ActiveMQExample
 {
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties b/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
index 0dac60eed0..07c84f2410 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml
index a46b9aaa80..0dc9d07bc0 100644
--- a/examples/jms/replicated-transaction-failover/pom.xml
+++ b/examples/jms/replicated-transaction-failover/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-replicated-transaction-failover-example
+   artemis-jms-replicated-transaction-failover-example
    jar
    ActiveMQ Artemis JMS Replicated Transaction Failover Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -128,27 +128,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-replicated-transaction-failover-example
+                        artemis-jms-replicated-transaction-failover-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java b/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedTransactionFailoverExample.java
similarity index 97%
rename from examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java
rename to examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedTransactionFailoverExample.java
index fda3f14a73..9f0e6f5295 100644
--- a/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java
+++ b/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/ReplicatedTransactionFailoverExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,8 +26,8 @@ import javax.jms.TextMessage;
 import javax.jms.TransactionRolledBackException;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates failover of the JMS connection from one node to another
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties b/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
index 0dac60eed0..07c84f2410 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml
index 46d8d26419..a16d881b41 100644
--- a/examples/jms/request-reply/pom.xml
+++ b/examples/jms/request-reply/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-request-reply-example
+   artemis-jms-request-reply-example
    jar
    ActiveMQ Artemis JMS Request Reply Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-request-reply-example
+                        artemis-jms-request-reply-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java b/examples/jms/request-reply/src/main/java/org/apache/activemq/artemis/jms/example/RequestReplyExample.java
similarity index 98%
rename from examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java
rename to examples/jms/request-reply/src/main/java/org/apache/activemq/artemis/jms/example/RequestReplyExample.java
index 3023e92b0a..ca002dc24a 100644
--- a/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java
+++ b/examples/jms/request-reply/src/main/java/org/apache/activemq/artemis/jms/example/RequestReplyExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,7 +33,7 @@ import javax.jms.TemporaryQueue;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that shows how to use Request/Replay style messaging.
diff --git a/examples/jms/request-reply/src/main/resources/jndi.properties b/examples/jms/request-reply/src/main/resources/jndi.properties
index 0dac60eed0..07c84f2410 100644
--- a/examples/jms/request-reply/src/main/resources/jndi.properties
+++ b/examples/jms/request-reply/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/rest/dup-send/pom.xml b/examples/jms/rest/dup-send/pom.xml
index aa0f4bc8de..4357be876b 100644
--- a/examples/jms/rest/dup-send/pom.xml
+++ b/examples/jms/rest/dup-send/pom.xml
@@ -22,8 +22,8 @@ under the License.
    4.0.0
    
       org.apache.activemq.examples.rest
-      activemq-rest-examples-pom
-      10.0.0-SNAPSHOT
+      artemis-rest-examples-pom
+      1.0.0-SNAPSHOT
    
    dup-send
    war
@@ -117,22 +117,22 @@ under the License.
    
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
@@ -145,7 +145,7 @@ under the License.
       
       
          org.apache.activemq.rest
-         activemq-rest
+         artemis-rest
          ${project.version}
       
       
diff --git a/examples/jms/rest/dup-send/src/main/java/PostOrder.java b/examples/jms/rest/dup-send/src/main/java/PostOrder.java
index 62599a8f0f..40944107a4 100644
--- a/examples/jms/rest/dup-send/src/main/java/PostOrder.java
+++ b/examples/jms/rest/dup-send/src/main/java/PostOrder.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.apache.activemq.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.spi.Link;
diff --git a/examples/jms/rest/javascript-chat/pom.xml b/examples/jms/rest/javascript-chat/pom.xml
index f7849c29f3..18e1a2f11b 100644
--- a/examples/jms/rest/javascript-chat/pom.xml
+++ b/examples/jms/rest/javascript-chat/pom.xml
@@ -22,8 +22,8 @@ under the License.
    4.0.0
    
       org.apache.activemq.examples.rest
-      activemq-rest-examples-pom
-      10.0.0-SNAPSHOT
+      artemis-rest-examples-pom
+      1.0.0-SNAPSHOT
    
    javascript-chat
    war
@@ -130,22 +130,22 @@ under the License.
    
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
@@ -158,7 +158,7 @@ under the License.
       
       
          org.apache.activemq.rest
-         activemq-rest
+         artemis-rest
          ${project.version}
       
       
diff --git a/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java b/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java
index 3518128965..6adb3d2852 100644
--- a/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java
+++ b/examples/jms/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java
@@ -19,7 +19,7 @@ package org.jboss.resteasy.messaging.test;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.spi.Link;
-import org.apache.activemq.rest.util.LinkStrategy;
+import org.apache.activemq.artemis.rest.util.LinkStrategy;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/examples/jms/rest/jms-to-rest/pom.xml b/examples/jms/rest/jms-to-rest/pom.xml
index 3dc94b162a..3ac92d79f5 100644
--- a/examples/jms/rest/jms-to-rest/pom.xml
+++ b/examples/jms/rest/jms-to-rest/pom.xml
@@ -22,8 +22,8 @@ under the License.
    4.0.0
    
       org.apache.activemq.examples.rest
-      activemq-rest-examples-pom
-      10.0.0-SNAPSHOT
+      artemis-rest-examples-pom
+      1.0.0-SNAPSHOT
    
    mixed-jms-rest
    war
@@ -117,22 +117,22 @@ under the License.
    
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
@@ -145,7 +145,7 @@ under the License.
       
       
          org.apache.activemq.rest
-         activemq-rest
+         artemis-rest
          ${project.version}
       
       
diff --git a/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java b/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java
index 2c27bf84b3..8afdd9b4f4 100644
--- a/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java
+++ b/examples/jms/rest/jms-to-rest/src/main/java/JmsHelper.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
-import org.apache.activemq.core.config.FileDeploymentManager;
-import org.apache.activemq.core.config.impl.FileConfiguration;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
+import org.apache.activemq.artemis.core.config.FileDeploymentManager;
+import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
diff --git a/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java b/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java
index 31040ae219..5aad419df6 100644
--- a/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java
+++ b/examples/jms/rest/jms-to-rest/src/main/java/JmsReceive.java
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.rest.Jms;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.rest.Jms;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
diff --git a/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java b/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java
index 078fee82fc..30112f4525 100644
--- a/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java
+++ b/examples/jms/rest/jms-to-rest/src/main/java/JmsSend.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.apache.activemq.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
diff --git a/examples/jms/rest/pom.xml b/examples/jms/rest/pom.xml
index d7963a3354..5355ad4b43 100644
--- a/examples/jms/rest/pom.xml
+++ b/examples/jms/rest/pom.xml
@@ -24,11 +24,11 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
    org.apache.activemq.examples.rest
-   activemq-rest-examples-pom
+   artemis-rest-examples-pom
    pom
    ActiveMQ Artemis REST Examples
 
diff --git a/examples/jms/rest/push/pom.xml b/examples/jms/rest/push/pom.xml
index 1992df96c3..7a7f7f4ea1 100644
--- a/examples/jms/rest/push/pom.xml
+++ b/examples/jms/rest/push/pom.xml
@@ -22,8 +22,8 @@ under the License.
    4.0.0
    
       org.apache.activemq.examples.rest
-      activemq-rest-examples-pom
-      10.0.0-SNAPSHOT
+      artemis-rest-examples-pom
+      1.0.0-SNAPSHOT
    
    push
    war
@@ -123,22 +123,22 @@ under the License.
    
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
@@ -151,7 +151,7 @@ under the License.
       
       
          org.apache.activemq.rest
-         activemq-rest
+         artemis-rest
          ${project.version}
       
       
diff --git a/examples/jms/rest/push/src/main/java/JmsHelper.java b/examples/jms/rest/push/src/main/java/JmsHelper.java
index 36c4bcad92..90c4338926 100644
--- a/examples/jms/rest/push/src/main/java/JmsHelper.java
+++ b/examples/jms/rest/push/src/main/java/JmsHelper.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.core.config.FileDeploymentManager;
-import org.apache.activemq.core.config.impl.FileConfiguration;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.core.config.FileDeploymentManager;
+import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
diff --git a/examples/jms/rest/push/src/main/java/PostOrder.java b/examples/jms/rest/push/src/main/java/PostOrder.java
index 2d70f9f1a6..9e138e1e09 100644
--- a/examples/jms/rest/push/src/main/java/PostOrder.java
+++ b/examples/jms/rest/push/src/main/java/PostOrder.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.apache.activemq.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
diff --git a/examples/jms/rest/push/src/main/java/PushReg.java b/examples/jms/rest/push/src/main/java/PushReg.java
index 0be6bc313e..793fdd9145 100644
--- a/examples/jms/rest/push/src/main/java/PushReg.java
+++ b/examples/jms/rest/push/src/main/java/PushReg.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.apache.activemq.rest.queue.push.xml.Authentication;
-import org.apache.activemq.rest.queue.push.xml.BasicAuth;
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
-import org.apache.activemq.rest.queue.push.xml.XmlLink;
+import org.apache.activemq.artemis.rest.queue.push.xml.Authentication;
+import org.apache.activemq.artemis.rest.queue.push.xml.BasicAuth;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.spi.Link;
diff --git a/examples/jms/rest/push/src/main/java/ReceiveShipping.java b/examples/jms/rest/push/src/main/java/ReceiveShipping.java
index 19b2de0946..1480bb5f36 100644
--- a/examples/jms/rest/push/src/main/java/ReceiveShipping.java
+++ b/examples/jms/rest/push/src/main/java/ReceiveShipping.java
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.rest.Jms;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.rest.Jms;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
diff --git a/examples/jms/scale-down/pom.xml b/examples/jms/scale-down/pom.xml
index befb5c7165..a6869cd75d 100644
--- a/examples/jms/scale-down/pom.xml
+++ b/examples/jms/scale-down/pom.xml
@@ -24,7 +24,7 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
    scale-down
@@ -34,7 +34,7 @@ under the License.
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -129,22 +129,22 @@ under the License.
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java b/examples/jms/scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ScaleDownExample.java
similarity index 97%
rename from examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java
rename to examples/jms/scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ScaleDownExample.java
index 0bcc4bc63e..06251c238a 100644
--- a/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java
+++ b/examples/jms/scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ScaleDownExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates a colocated server
diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml
index 10d9709bdf..88d3340e2f 100644
--- a/examples/jms/scheduled-message/pom.xml
+++ b/examples/jms/scheduled-message/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-scheduled-message-example
+   artemis-jms-scheduled-message-example
    jar
    ActiveMQ Artemis JMS Scheduled Message Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-scheduled-message-example
+                        artemis-jms-scheduled-message-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java b/examples/jms/scheduled-message/src/main/java/org/apache/activemq/artemis/jms/example/ScheduledMessageExample.java
similarity index 95%
rename from examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java
rename to examples/jms/scheduled-message/src/main/java/org/apache/activemq/artemis/jms/example/ScheduledMessageExample.java
index 53e8d1aa8f..8e0b976eed 100644
--- a/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java
+++ b/examples/jms/scheduled-message/src/main/java/org/apache/activemq/artemis/jms/example/ScheduledMessageExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -28,8 +28,8 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 public class ScheduledMessageExample extends ActiveMQExample
 {
diff --git a/examples/jms/scheduled-message/src/main/resources/jndi.properties b/examples/jms/scheduled-message/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/scheduled-message/src/main/resources/jndi.properties
+++ b/examples/jms/scheduled-message/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml
index 7965f7fb05..49d09c4631 100644
--- a/examples/jms/security/pom.xml
+++ b/examples/jms/security/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-security-example
+   artemis-jms-security-example
    jar
    ActiveMQ Artemis JMS Security Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-security-example
+                        artemis-jms-security-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java b/examples/jms/security/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java
similarity index 99%
rename from examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java
rename to examples/jms/security/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java
index c3a7440f15..978ec4cabc 100644
--- a/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java
+++ b/examples/jms/security/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -27,7 +27,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 public class SecurityExample extends ActiveMQExample
 {
diff --git a/examples/jms/security/src/main/resources/jndi.properties b/examples/jms/security/src/main/resources/jndi.properties
index 6b6ec9ff1d..c99ee9f020 100644
--- a/examples/jms/security/src/main/resources/jndi.properties
+++ b/examples/jms/security/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 topic.topic/genericTopic=genericTopic
 topic.topic/europeTopic=news.europe.europeTopic
diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml
index 23dcadde6c..8401190b6f 100644
--- a/examples/jms/send-acknowledgements/pom.xml
+++ b/examples/jms/send-acknowledgements/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-send-acknowledgements-example
+   artemis-jms-send-acknowledgements-example
    jar
    ActiveMQ Artemis JMS Send Acknowledgements Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-send-acknowledgements-example
+                        artemis-jms-send-acknowledgements-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java
similarity index 91%
rename from examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java
rename to examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java
index 506fef1991..f1b0d0fb10 100644
--- a/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java
+++ b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/artemis/jms/example/SendAcknowledgementsExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -24,11 +24,11 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.jms.client.ActiveMQSession;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.jms.client.ActiveMQSession;
 
 /**
  *
diff --git a/examples/jms/send-acknowledgements/src/main/resources/jndi.properties b/examples/jms/send-acknowledgements/src/main/resources/jndi.properties
index 948acfe132..612dd06af8 100644
--- a/examples/jms/send-acknowledgements/src/main/resources/jndi.properties
+++ b/examples/jms/send-acknowledgements/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?confirmationWindowSize=1048576
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/spring-integration/pom.xml b/examples/jms/spring-integration/pom.xml
index 92ad762278..c25b9326c3 100644
--- a/examples/jms/spring-integration/pom.xml
+++ b/examples/jms/spring-integration/pom.xml
@@ -24,22 +24,22 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-spring-integration-example
+   artemis-jms-spring-integration-example
    jar
    ActiveMQ Artemis JMS Spring Integration Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
          org.apache.activemq
-         activemq-spring-integration
+         artemis-spring-integration
          ${project.version}
       
       
@@ -59,7 +59,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         runClient
@@ -74,27 +74,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-spring-integration-example
+                        artemis-jms-spring-integration-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/ExampleListener.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/ExampleListener.java
similarity index 96%
rename from examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/ExampleListener.java
rename to examples/jms/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/ExampleListener.java
index 5c6f371fd7..70dce8ba08 100644
--- a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/ExampleListener.java
+++ b/examples/jms/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/ExampleListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
diff --git a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/MessageSender.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/MessageSender.java
similarity index 97%
rename from examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/MessageSender.java
rename to examples/jms/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/MessageSender.java
index 1d5401db68..e5680e1e65 100644
--- a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/MessageSender.java
+++ b/examples/jms/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/MessageSender.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
diff --git a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/SpringExample.java b/examples/jms/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/SpringExample.java
similarity index 96%
rename from examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/SpringExample.java
rename to examples/jms/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/SpringExample.java
index 718daf3f10..465a491782 100644
--- a/examples/jms/spring-integration/src/main/java/org/apache/activemq/jms/example/SpringExample.java
+++ b/examples/jms/spring-integration/src/main/java/org/apache/activemq/artemis/jms/example/SpringExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml b/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml
index 14bb5c8fc3..68d1f945c4 100644
--- a/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml
+++ b/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml
@@ -24,9 +24,9 @@ under the License.
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-   
+   
       
-         
+         
             
                
                   
@@ -46,27 +46,27 @@ under the License.
       
    
 
-   
        
    
 
-   
+   
       
       
          
-            
+            
          
       
    
 
-   
+   
       
    
 
-   
+   
 
-   
+   
       
       
    
@@ -77,4 +77,4 @@ under the License.
       
    
 
-    
+
diff --git a/examples/jms/ssl-enabled/pom.xml b/examples/jms/ssl-enabled/pom.xml
index 548b6674dd..9a49a0ec0b 100644
--- a/examples/jms/ssl-enabled/pom.xml
+++ b/examples/jms/ssl-enabled/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-ssl-enabled-example
+   artemis-jms-ssl-enabled-example
    jar
    ActiveMQ Artemis JMS SSL Enabled Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-ssl-enabled-example
+                        artemis-jms-ssl-enabled-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java b/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/artemis/jms/example/SSLExample.java
similarity index 96%
rename from examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java
rename to examples/jms/ssl-enabled/src/main/java/org/apache/activemq/artemis/jms/example/SSLExample.java
index f7abe9097e..436afae0b5 100644
--- a/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java
+++ b/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/artemis/jms/example/SSLExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Queue example that uses SSL secure transport.
diff --git a/examples/jms/ssl-enabled/src/main/resources/jndi.properties b/examples/jms/ssl-enabled/src/main/resources/jndi.properties
index a93d970c3c..3ef33e683a 100644
--- a/examples/jms/ssl-enabled/src/main/resources/jndi.properties
+++ b/examples/jms/ssl-enabled/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:5500?sslEnabled=true&trustStorePath=activemq/server0/activemq.example.truststore&trustStorePassword=activemqexample
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/static-selector-jms/pom.xml b/examples/jms/static-selector-jms/pom.xml
index 05865a2ede..77e63f053e 100644
--- a/examples/jms/static-selector-jms/pom.xml
+++ b/examples/jms/static-selector-jms/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-static-selector-jms-example
+   artemis-jms-static-selector-jms-example
    jar
    ActiveMQ Artemis JMS Static Selector Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -88,27 +88,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-static-selector-jms-example
+                        artemis-jms-static-selector-jms-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java b/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/artemis/jms/example/StaticSelectorJMSExample.java
similarity index 97%
rename from examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java
rename to examples/jms/static-selector-jms/src/main/java/org/apache/activemq/artemis/jms/example/StaticSelectorJMSExample.java
index 0c82876f01..1be4d63f9c 100644
--- a/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java
+++ b/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/artemis/jms/example/StaticSelectorJMSExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -28,7 +28,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that shows how static message selectors work when using JMS config.
diff --git a/examples/jms/static-selector-jms/src/main/resources/jndi.properties b/examples/jms/static-selector-jms/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/static-selector-jms/src/main/resources/jndi.properties
+++ b/examples/jms/static-selector-jms/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/static-selector/pom.xml b/examples/jms/static-selector/pom.xml
index 06f3bff205..a8dbd43bc7 100644
--- a/examples/jms/static-selector/pom.xml
+++ b/examples/jms/static-selector/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-static-selector-example
+   artemis-static-selector-example
    jar
    ActiveMQ Artemis Static Selector Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-static-selector-example
+                        artemis-static-selector-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java b/examples/jms/static-selector/src/main/java/org/apache/activemq/artemis/jms/example/StaticSelectorExample.java
similarity index 97%
rename from examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java
rename to examples/jms/static-selector/src/main/java/org/apache/activemq/artemis/jms/example/StaticSelectorExample.java
index c77fb2c7ef..922619dda6 100644
--- a/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java
+++ b/examples/jms/static-selector/src/main/java/org/apache/activemq/artemis/jms/example/StaticSelectorExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -28,7 +28,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that shows how static message selectors work.
diff --git a/examples/jms/static-selector/src/main/resources/jndi.properties b/examples/jms/static-selector/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/static-selector/src/main/resources/jndi.properties
+++ b/examples/jms/static-selector/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/stomp-websockets/pom.xml b/examples/jms/stomp-websockets/pom.xml
index 3ba0004d0b..0281a0ab9b 100644
--- a/examples/jms/stomp-websockets/pom.xml
+++ b/examples/jms/stomp-websockets/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-stomp-websockets-example
+   artemis-jms-stomp-websockets-example
    jar
    ActiveMQ Artemis JMS StompWebSocketExample Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -92,32 +92,32 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-stomp-websockets-example
+                        artemis-jms-stomp-websockets-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-stomp-protocol
+                        artemis-stomp-protocol
                         ${project.version}
                      
                      
diff --git a/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java b/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/artemis/jms/example/StompWebSocketExample.java
similarity index 96%
rename from examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java
rename to examples/jms/stomp-websockets/src/main/java/org/apache/activemq/artemis/jms/example/StompWebSocketExample.java
index 878a210187..0434c32bb2 100644
--- a/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java
+++ b/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/artemis/jms/example/StompWebSocketExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Date;
 
@@ -27,7 +27,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example where a client will send a JMS message to a Topic.
diff --git a/examples/jms/stomp-websockets/src/main/resources/jndi.properties b/examples/jms/stomp-websockets/src/main/resources/jndi.properties
index cfa37b13cd..be7c985509 100644
--- a/examples/jms/stomp-websockets/src/main/resources/jndi.properties
+++ b/examples/jms/stomp-websockets/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 topic.topic/chat=chat
diff --git a/examples/jms/stomp/pom.xml b/examples/jms/stomp/pom.xml
index 282c6baf89..a4adf6fcad 100644
--- a/examples/jms/stomp/pom.xml
+++ b/examples/jms/stomp/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-stomp-example
+   artemis-jms-stomp-example
    jar
    ActiveMQ Artemis JMS Stomp Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,32 +85,32 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-stomp-example
+                        artemis-jms-stomp-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-stomp-protocol
+                        artemis-stomp-protocol
                         ${project.version}
                      
                      
diff --git a/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java b/examples/jms/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
similarity index 97%
rename from examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java
rename to examples/jms/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
index f9c85fb269..16fddbac9b 100644
--- a/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java
+++ b/examples/jms/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -30,7 +30,7 @@ import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example where a client will send a Stomp message on a TCP socket
diff --git a/examples/jms/stomp/src/main/resources/jndi.properties b/examples/jms/stomp/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/stomp/src/main/resources/jndi.properties
+++ b/examples/jms/stomp/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/stomp1.1/pom.xml b/examples/jms/stomp1.1/pom.xml
index 66172e2170..1644a7e4f4 100644
--- a/examples/jms/stomp1.1/pom.xml
+++ b/examples/jms/stomp1.1/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-stomp1.1-example
+   artemis-jms-stomp1.1-example
    jar
    ActiveMQ Artemis JMS Stomp 1.1 Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,32 +85,32 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-stomp1.1-example
+                        artemis-jms-stomp1.1-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-stomp-protocol
+                        artemis-stomp-protocol
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java b/examples/jms/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
similarity index 97%
rename from examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java
rename to examples/jms/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
index 0e0b24097a..476677b389 100644
--- a/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java
+++ b/examples/jms/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -29,7 +29,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example where a Stomp 1.1 client sends a message on a TCP socket
diff --git a/examples/jms/stomp1.1/src/main/resources/jndi.properties b/examples/jms/stomp1.1/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/stomp1.1/src/main/resources/jndi.properties
+++ b/examples/jms/stomp1.1/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/stomp1.2/pom.xml b/examples/jms/stomp1.2/pom.xml
index a044a311d3..ac8a27bffa 100644
--- a/examples/jms/stomp1.2/pom.xml
+++ b/examples/jms/stomp1.2/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-stomp1.2-example
+   artemis-jms-stomp1.2-example
    jar
    ActiveMQ Artemis JMS Stomp 1.2 Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,32 +85,32 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-stomp1.2-example
+                        artemis-jms-stomp1.2-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-stomp-protocol
+                        artemis-stomp-protocol
                         ${project.version}
                      
                      
diff --git a/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java b/examples/jms/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
similarity index 97%
rename from examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java
rename to examples/jms/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
index d8c790e590..9a287e16bf 100644
--- a/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java
+++ b/examples/jms/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -28,7 +28,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example where a Stomp 1.2 client sends a message on a TCP socket
diff --git a/examples/jms/stomp1.2/src/main/resources/jndi.properties b/examples/jms/stomp1.2/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/stomp1.2/src/main/resources/jndi.properties
+++ b/examples/jms/stomp1.2/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/stop-server-failover/pom.xml b/examples/jms/stop-server-failover/pom.xml
index 67bb698772..c27e4793ca 100644
--- a/examples/jms/stop-server-failover/pom.xml
+++ b/examples/jms/stop-server-failover/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-stop-server-failover-example
+   artemis-jms-stop-server-failover-example
    jar
    ActiveMQ Artemis JMS Stop Server Failover Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -132,27 +132,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-stop-server-failover-example
+                        artemis-jms-stop-server-failover-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/stop-server-failover/src/main/java/org/apache/activemq/jms/example/StopServerFailoverExample.java b/examples/jms/stop-server-failover/src/main/java/org/apache/activemq/artemis/jms/example/StopServerFailoverExample.java
similarity index 97%
rename from examples/jms/stop-server-failover/src/main/java/org/apache/activemq/jms/example/StopServerFailoverExample.java
rename to examples/jms/stop-server-failover/src/main/java/org/apache/activemq/artemis/jms/example/StopServerFailoverExample.java
index fde68121dd..a25382be6d 100644
--- a/examples/jms/stop-server-failover/src/main/java/org/apache/activemq/jms/example/StopServerFailoverExample.java
+++ b/examples/jms/stop-server-failover/src/main/java/org/apache/activemq/artemis/jms/example/StopServerFailoverExample.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
diff --git a/examples/jms/stop-server-failover/src/main/resources/jndi.properties b/examples/jms/stop-server-failover/src/main/resources/jndi.properties
index 0dac60eed0..07c84f2410 100644
--- a/examples/jms/stop-server-failover/src/main/resources/jndi.properties
+++ b/examples/jms/stop-server-failover/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/symmetric-cluster/pom.xml b/examples/jms/symmetric-cluster/pom.xml
index 2404eae983..6777edc202 100644
--- a/examples/jms/symmetric-cluster/pom.xml
+++ b/examples/jms/symmetric-cluster/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-symmetric-cluster-example
+   artemis-jms-symmetric-cluster-example
    jar
    ActiveMQ Artemis JMS Symmetric Cluster Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -252,27 +252,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-symmetric-cluster-example
+                        artemis-jms-symmetric-cluster-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/jms/example/SymmetricClusterExample.java b/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java
similarity index 95%
rename from examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/jms/example/SymmetricClusterExample.java
rename to examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java
index 0493df6271..5a513c65d1 100644
--- a/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/jms/example/SymmetricClusterExample.java
+++ b/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,11 +25,11 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates a cluster of three nodes set up in a symmetric topology - i.e. each
diff --git a/examples/jms/temp-queue/pom.xml b/examples/jms/temp-queue/pom.xml
index 4627935a8e..df145d0571 100644
--- a/examples/jms/temp-queue/pom.xml
+++ b/examples/jms/temp-queue/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-temp-queue-example
+   artemis-jms-temp-queue-example
    jar
    ActiveMQ Artemis JMS Temporary Queue Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-temp-queue-example
+                        artemis-jms-temp-queue-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/temp-queue/src/main/java/org/apache/activemq/jms/example/TemporaryQueueExample.java b/examples/jms/temp-queue/src/main/java/org/apache/activemq/artemis/jms/example/TemporaryQueueExample.java
similarity index 97%
rename from examples/jms/temp-queue/src/main/java/org/apache/activemq/jms/example/TemporaryQueueExample.java
rename to examples/jms/temp-queue/src/main/java/org/apache/activemq/artemis/jms/example/TemporaryQueueExample.java
index 039af50185..4335edd3bb 100644
--- a/examples/jms/temp-queue/src/main/java/org/apache/activemq/jms/example/TemporaryQueueExample.java
+++ b/examples/jms/temp-queue/src/main/java/org/apache/activemq/artemis/jms/example/TemporaryQueueExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.TemporaryQueue;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that shows how to use temporary queues.
diff --git a/examples/jms/temp-queue/src/main/resources/jndi.properties b/examples/jms/temp-queue/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/temp-queue/src/main/resources/jndi.properties
+++ b/examples/jms/temp-queue/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/topic-hierarchies/pom.xml b/examples/jms/topic-hierarchies/pom.xml
index 9ffad89a20..e45cd83348 100644
--- a/examples/jms/topic-hierarchies/pom.xml
+++ b/examples/jms/topic-hierarchies/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-topic-hierarchies-example
+   artemis-jms-topic-hierarchies-example
    jar
    ActiveMQ Artemis JMS Topic Hierarchies Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-topic-hierarchies-example
+                        artemis-jms-topic-hierarchies-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java b/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java
similarity index 96%
rename from examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java
rename to examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java
index 9ca170cadc..6ef36eee4f 100644
--- a/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java
+++ b/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/artemis/jms/example/TopicHierarchyExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,8 +26,8 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates how a JMS TopicSubscriber can be created to subscribe to a wild-card Topic.
diff --git a/examples/jms/topic-hierarchies/src/main/resources/jndi.properties b/examples/jms/topic-hierarchies/src/main/resources/jndi.properties
index 40ed6404f5..ed96c02136 100644
--- a/examples/jms/topic-hierarchies/src/main/resources/jndi.properties
+++ b/examples/jms/topic-hierarchies/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
diff --git a/examples/jms/topic-selector-example1/pom.xml b/examples/jms/topic-selector-example1/pom.xml
index 3b7e37b0b6..6ef0b1161d 100644
--- a/examples/jms/topic-selector-example1/pom.xml
+++ b/examples/jms/topic-selector-example1/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-topic-selector-example1-example
+   artemis-jms-topic-selector-example1-example
    jar
    ActiveMQ Artemis JMS Topic Selector Example 1
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-topic-selector-example1-example
+                        artemis-jms-topic-selector-example1-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java b/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java
similarity index 98%
rename from examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java
rename to examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java
index 961144c9e2..6bc40ad0f5 100644
--- a/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java
+++ b/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample1.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Topic example that creates a producer and consumer on a queue and sends and receives a message.
diff --git a/examples/jms/topic-selector-example1/src/main/resources/jndi.properties b/examples/jms/topic-selector-example1/src/main/resources/jndi.properties
index 09611dc302..560b0cbb83 100644
--- a/examples/jms/topic-selector-example1/src/main/resources/jndi.properties
+++ b/examples/jms/topic-selector-example1/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 topic.topic/exampleTopic=exampleTopic
diff --git a/examples/jms/topic-selector-example2/pom.xml b/examples/jms/topic-selector-example2/pom.xml
index 1b9be6c544..742d692aa1 100644
--- a/examples/jms/topic-selector-example2/pom.xml
+++ b/examples/jms/topic-selector-example2/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-topic-selector-example2-example
+   artemis-jms-topic-selector-example2-example
    jar
    ActiveMQ Artemis JMS Topic Selector Example 2
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-topic-selector-example2-example
+                        artemis-jms-topic-selector-example2-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java b/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java
similarity index 97%
rename from examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java
rename to examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java
index e25517f50d..c2acfd4a25 100644
--- a/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java
+++ b/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/artemis/jms/example/TopicSelectorExample2.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -28,7 +28,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that consumes messages using selectors.
diff --git a/examples/jms/topic-selector-example2/src/main/resources/jndi.properties b/examples/jms/topic-selector-example2/src/main/resources/jndi.properties
index 09611dc302..560b0cbb83 100644
--- a/examples/jms/topic-selector-example2/src/main/resources/jndi.properties
+++ b/examples/jms/topic-selector-example2/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 topic.topic/exampleTopic=exampleTopic
diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml
index cc86042a66..e259b9313e 100644
--- a/examples/jms/topic/pom.xml
+++ b/examples/jms/topic/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-topic-example
+   artemis-jms-topic-example
    jar
    ActiveMQ Artemis JMS Topic Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -49,7 +49,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -87,27 +87,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-topic-example
+                        artemis-jms-topic-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java b/examples/jms/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java
similarity index 96%
rename from examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java
rename to examples/jms/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java
index 60b08303f6..8b856434d8 100644
--- a/examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java
+++ b/examples/jms/topic/src/main/java/org/apache/activemq/artemis/jms/example/TopicExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Topic example that creates a producer and consumer on a queue and sends and receives a message.
diff --git a/examples/jms/topic/src/main/resources/jndi.properties b/examples/jms/topic/src/main/resources/jndi.properties
index 09611dc302..560b0cbb83 100644
--- a/examples/jms/topic/src/main/resources/jndi.properties
+++ b/examples/jms/topic/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 topic.topic/exampleTopic=exampleTopic
diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml
index c8dd77a7a3..cf4254eb07 100644
--- a/examples/jms/transaction-failover/pom.xml
+++ b/examples/jms/transaction-failover/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-transaction-failover-example
+   artemis-jms-transaction-failover-example
    jar
    ActiveMQ Artemis JMS Transaction Failover Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start0
@@ -128,27 +128,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-transaction-failover-example
+                        artemis-jms-transaction-failover-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java b/examples/jms/transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/TransactionFailoverExample.java
similarity index 97%
rename from examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java
rename to examples/jms/transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/TransactionFailoverExample.java
index 7d81c0174c..df7b930872 100644
--- a/examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java
+++ b/examples/jms/transaction-failover/src/main/java/org/apache/activemq/artemis/jms/example/TransactionFailoverExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,8 +26,8 @@ import javax.jms.TextMessage;
 import javax.jms.TransactionRolledBackException;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates failover of the JMS connection from one node to another
diff --git a/examples/jms/transaction-failover/src/main/resources/jndi.properties b/examples/jms/transaction-failover/src/main/resources/jndi.properties
index 0dac60eed0..07c84f2410 100644
--- a/examples/jms/transaction-failover/src/main/resources/jndi.properties
+++ b/examples/jms/transaction-failover/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml
index b82da66aba..22adc90171 100644
--- a/examples/jms/transactional/pom.xml
+++ b/examples/jms/transactional/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-transactional-example
+   artemis-jms-transactional-example
    jar
    ActiveMQ Artemis JMS Transactional Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-transactional-example
+                        artemis-jms-transactional-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java b/examples/jms/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java
similarity index 97%
rename from examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java
rename to examples/jms/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java
index 5919e314e7..b5383338d8 100644
--- a/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java
+++ b/examples/jms/transactional/src/main/java/org/apache/activemq/artemis/jms/example/TransactionalExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,7 +25,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that sends and consume message transactionally.
diff --git a/examples/jms/transactional/src/main/resources/jndi.properties b/examples/jms/transactional/src/main/resources/jndi.properties
index 1cb3686d6f..4836ac892f 100644
--- a/examples/jms/transactional/src/main/resources/jndi.properties
+++ b/examples/jms/transactional/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml
index c78760001c..31fe3f65a1 100644
--- a/examples/jms/xa-heuristic/pom.xml
+++ b/examples/jms/xa-heuristic/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-xa-heuristic-example
+   artemis-jms-xa-heuristic-example
    jar
    ActiveMQ Artemis JMS XAHeuristicExample Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -103,27 +103,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-xa-heuristic-example
+                        artemis-jms-xa-heuristic-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java b/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java
similarity index 96%
rename from examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java
rename to examples/jms/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java
index e82b358131..4e3434f9dd 100644
--- a/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java
+++ b/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/XAHeuristicExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -40,10 +40,10 @@ import javax.naming.InitialContext;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.common.example.DummyXid;
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.common.example.DummyXid;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 /**
  * A simple JMS example showing how to administer un-finished transactions.
diff --git a/examples/jms/xa-heuristic/src/main/resources/jndi.properties b/examples/jms/xa-heuristic/src/main/resources/jndi.properties
index bf096430ef..79d8e1a018 100644
--- a/examples/jms/xa-heuristic/src/main/resources/jndi.properties
+++ b/examples/jms/xa-heuristic/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml
index a02e903e5a..81a1b44429 100644
--- a/examples/jms/xa-receive/pom.xml
+++ b/examples/jms/xa-receive/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-xa-receive-example
+   artemis-jms-xa-receive-example
    jar
    ActiveMQ Artemis JMS XA Receive Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-xa-receive-example
+                        artemis-jms-xa-receive-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java b/examples/jms/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java
similarity index 96%
rename from examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java
rename to examples/jms/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java
index 6c03d95fae..a59991a732 100644
--- a/examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java
+++ b/examples/jms/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/XAReceiveExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.nio.charset.StandardCharsets;
 
@@ -30,9 +30,9 @@ import javax.naming.InitialContext;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.common.example.DummyXid;
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.common.example.DummyXid;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 /**
  * A simple JMS example showing the usage of XA support in JMS.
diff --git a/examples/jms/xa-receive/src/main/resources/jndi.properties b/examples/jms/xa-receive/src/main/resources/jndi.properties
index bf096430ef..79d8e1a018 100644
--- a/examples/jms/xa-receive/src/main/resources/jndi.properties
+++ b/examples/jms/xa-receive/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml
index f0747d18cb..2052a8b8fd 100644
--- a/examples/jms/xa-send/pom.xml
+++ b/examples/jms/xa-send/pom.xml
@@ -24,17 +24,17 @@ under the License.
    
       org.apache.activemq.examples.jms
       jms-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
-   activemq-jms-xa-send-example
+   artemis-jms-xa-send-example
    jar
    ActiveMQ Artemis JMS XA Send Example
 
    
       
          org.apache.activemq.examples.jms
-         activemq-jms-examples-common
+         artemis-jms-examples-common
          ${project.version}
       
       
@@ -50,7 +50,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -85,27 +85,27 @@ under the License.
                   
                      
                         org.apache.activemq.examples.jms
-                        activemq-jms-xa-send-example
+                        artemis-jms-xa-send-example
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-core-client
+                        artemis-core-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-server
+                        artemis-server
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-client
+                        artemis-jms-client
                         ${project.version}
                      
                      
                         org.apache.activemq
-                        activemq-jms-server
+                        artemis-jms-server
                         ${project.version}
                      
                      
diff --git a/examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java b/examples/jms/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java
similarity index 96%
rename from examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java
rename to examples/jms/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java
index 24edd84c86..e97e500d68 100644
--- a/examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java
+++ b/examples/jms/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/XASendExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -34,9 +34,9 @@ import javax.naming.InitialContext;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.common.example.DummyXid;
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.common.example.DummyXid;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 /**
  * A simple JMS example showing the usage of XA support in JMS.
diff --git a/examples/jms/xa-send/src/main/resources/jndi.properties b/examples/jms/xa-send/src/main/resources/jndi.properties
index bf096430ef..79d8e1a018 100644
--- a/examples/jms/xa-send/src/main/resources/jndi.properties
+++ b/examples/jms/xa-send/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF
 queue.queue/exampleQueue=exampleQueue
diff --git a/examples/pom.xml b/examples/pom.xml
index c26179d8e7..4a4bb0177d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,12 +23,12 @@ under the License.
 
    
       org.apache.activemq
-      activemq-pom
-      10.0.0-SNAPSHOT
+      artemis-pom
+      1.0.0-SNAPSHOT
    
 
    org.apache.activemq.examples
-   activemq-examples
+   artemis-examples
    pom
    ActiveMQ Artemis Examples
 
diff --git a/examples/soak/normal/pom.xml b/examples/soak/normal/pom.xml
index 8c5076575b..7c0c4b904c 100644
--- a/examples/soak/normal/pom.xml
+++ b/examples/soak/normal/pom.xml
@@ -21,20 +21,20 @@ under the License.
 
 
    4.0.0
-   activemq-jms-soak-example
+   artemis-jms-soak-example
    jar
    ActiveMQ Artemis Soak Normal Example
 
    
       org.apache.activemq.examples.soak
       soak-examples
-      10.0.0-SNAPSHOT
+      1.0.0-SNAPSHOT
    
 
    
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
    
@@ -47,21 +47,21 @@ under the License.
       
          
             org.apache.activemq
-            activemq-maven-plugin
+            artemis-maven-plugin
             
                
                   org.apache.activemq.example.soak
-                  activemq-jms-soak-example
+                  artemis-jms-soak-example
                   ${project.version}
                
                
                   org.apache.activemq
-                  activemq-server
+                  artemis-server
                   ${project.version}
                
                
                   org.apache.activemq
-                  activemq-jms-server
+                  artemis-jms-server
                   ${project.version}
                
                
@@ -90,7 +90,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
@@ -146,7 +146,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         runConsumer
@@ -183,7 +183,7 @@ under the License.
             
                
                   org.apache.activemq
-                  activemq-maven-plugin
+                  artemis-maven-plugin
                   
                      
                         start
diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakBase.java b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java
similarity index 98%
rename from examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakBase.java
rename to examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java
index c852d1f592..3343f59a92 100644
--- a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakBase.java
+++ b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.soak.example;
+package org.apache.activemq.artemis.jms.soak.example;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakParams.java b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakParams.java
similarity index 98%
rename from examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakParams.java
rename to examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakParams.java
index d0977306b5..43ed549a3e 100644
--- a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakParams.java
+++ b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakParams.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.soak.example;
+package org.apache.activemq.artemis.jms.soak.example;
 
 import java.io.Serializable;
 
diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java
similarity index 99%
rename from examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java
rename to examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java
index 63b5abd92a..5e22c9b2d9 100644
--- a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java
+++ b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.soak.example;
+package org.apache.activemq.artemis.jms.soak.example;
 
 import java.lang.Override;
 import java.lang.Runnable;
diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java
similarity index 97%
rename from examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java
rename to examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java
index 1b13f1774d..7f51a5391a 100644
--- a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java
+++ b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.soak.example;
+package org.apache.activemq.artemis.jms.soak.example;
 
 import java.util.Hashtable;
 import java.util.concurrent.atomic.AtomicLong;
@@ -32,8 +32,8 @@ import javax.jms.Session;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.activemq.utils.TokenBucketLimiter;
-import org.apache.activemq.utils.TokenBucketLimiterImpl;
+import org.apache.activemq.artemis.utils.TokenBucketLimiter;
+import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl;
 
 public class SoakSender
 {
diff --git a/examples/soak/pom.xml b/examples/soak/pom.xml
index 652ac91e81..403d3b22d4 100644
--- a/examples/soak/pom.xml
+++ b/examples/soak/pom.xml
@@ -23,8 +23,8 @@ under the License.
 
    
       org.apache.activemq.examples
-      activemq-examples
-      10.0.0-SNAPSHOT
+      artemis-examples
+      1.0.0-SNAPSHOT
    
 
    org.apache.activemq.examples.soak
diff --git a/integration/activemq-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml
index 706dad8252..bd023ce0c6 100644
--- a/integration/activemq-aerogear-integration/pom.xml
+++ b/integration/activemq-aerogear-integration/pom.xml
@@ -19,12 +19,12 @@
 
    
       org.apache.activemq
-      activemq-pom
-      10.0.0-SNAPSHOT
+      artemis-pom
+      1.0.0-SNAPSHOT
       ../../pom.xml
    
 
-   activemq-aerogear-integration
+   artemis-aerogear-integration
    jar
    ActiveMQ Artemis Aerogear Integration
 
@@ -49,7 +49,7 @@
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
 
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java
similarity index 93%
rename from integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java
rename to integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java
index 945e484c72..231d3424ce 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.aerogear;
+package org.apache.activemq.artemis.integration.aerogear;
 
-import org.apache.activemq.api.core.ActiveMQIllegalStateException;
+import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageBundle;
 import org.jboss.logging.Messages;
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearLogger.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java
similarity index 97%
rename from integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearLogger.java
rename to integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java
index 681e0f1b04..e371cd3c81 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearLogger.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearLogger.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.aerogear;
+package org.apache.activemq.artemis.integration.aerogear;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorService.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java
similarity index 93%
rename from integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorService.java
rename to integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java
index b37e0208bf..f27a60cb40 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorService.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorService.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.aerogear;
+package org.apache.activemq.artemis.integration.aerogear;
 
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -26,19 +26,19 @@ import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.filter.impl.FilterImpl;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.server.ActiveMQServerLogger;
-import org.apache.activemq.core.server.ConnectorService;
-import org.apache.activemq.core.server.Consumer;
-import org.apache.activemq.core.server.HandleStatus;
-import org.apache.activemq.core.server.MessageReference;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.utils.ConfigurationHelper;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.filter.impl.FilterImpl;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
+import org.apache.activemq.artemis.core.server.ConnectorService;
+import org.apache.activemq.artemis.core.server.Consumer;
+import org.apache.activemq.artemis.core.server.HandleStatus;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.utils.ConfigurationHelper;
 import org.jboss.aerogear.unifiedpush.JavaSender;
 import org.jboss.aerogear.unifiedpush.SenderClient;
 import org.jboss.aerogear.unifiedpush.message.MessageResponseCallback;
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorServiceFactory.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java
similarity index 82%
rename from integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorServiceFactory.java
rename to integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java
index 1c820905da..d3eaea70ae 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConnectorServiceFactory.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConnectorServiceFactory.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.aerogear;
+package org.apache.activemq.artemis.integration.aerogear;
 
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.server.ConnectorService;
-import org.apache.activemq.core.server.ConnectorServiceFactory;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.server.ConnectorService;
+import org.apache.activemq.artemis.core.server.ConnectorServiceFactory;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConstants.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java
similarity index 97%
rename from integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConstants.java
rename to integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java
index d78c744eff..a8669dff75 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/AeroGearConstants.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/AeroGearConstants.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.aerogear;
+package org.apache.activemq.artemis.integration.aerogear;
 
-import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.SimpleString;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml
index eb5c80d8ef..227e77c2c5 100644
--- a/integration/activemq-spring-integration/pom.xml
+++ b/integration/activemq-spring-integration/pom.xml
@@ -20,12 +20,12 @@
 
    
       org.apache.activemq
-      activemq-pom
-      10.0.0-SNAPSHOT
+      artemis-pom
+      1.0.0-SNAPSHOT
       ../../pom.xml
    
 
-   activemq-spring-integration
+   artemis-spring-integration
    jar
    ActiveMQ Artemis Spring Integration
 
@@ -50,12 +50,12 @@
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringBindingRegistry.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java
similarity index 92%
rename from integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringBindingRegistry.java
rename to integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java
index 27b621de30..8dfcd50d27 100644
--- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringBindingRegistry.java
+++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.spring;
+package org.apache.activemq.artemis.integration.spring;
 
-import org.apache.activemq.spi.core.naming.BindingRegistry;
+import org.apache.activemq.artemis.spi.core.naming.BindingRegistry;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 
diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringJmsBootstrap.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java
similarity index 91%
rename from integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringJmsBootstrap.java
rename to integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java
index ffce5e5e0c..4d855dacb8 100644
--- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/integration/spring/SpringJmsBootstrap.java
+++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.spring;
+package org.apache.activemq.artemis.integration.spring;
 
-import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/ActiveMQSpringBundle.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java
similarity index 96%
rename from integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/ActiveMQSpringBundle.java
rename to integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java
index 6e30524ca3..3e089b7833 100644
--- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/ActiveMQSpringBundle.java
+++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringBundle.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.spring;
+package org.apache.activemq.artemis.spring;
 
 
 import org.jboss.logging.annotations.MessageBundle;
diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/ActiveMQSpringLogger.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java
similarity index 96%
rename from integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/ActiveMQSpringLogger.java
rename to integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java
index 96f637b04f..fa55588161 100644
--- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/spring/ActiveMQSpringLogger.java
+++ b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/spring/ActiveMQSpringLogger.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.spring;
+package org.apache.activemq.artemis.spring;
 
 import org.jboss.logging.annotations.MessageLogger;
 
diff --git a/integration/activemq-vertx-integration/pom.xml b/integration/activemq-vertx-integration/pom.xml
index 2f7a2db01d..63c47e6b47 100644
--- a/integration/activemq-vertx-integration/pom.xml
+++ b/integration/activemq-vertx-integration/pom.xml
@@ -20,12 +20,12 @@
 
    
       org.apache.activemq
-      activemq-pom
-      10.0.0-SNAPSHOT
+      artemis-pom
+      1.0.0-SNAPSHOT
       ../../pom.xml
    
 
-   activemq-vertx-integration
+   artemis-vertx-integration
    jar
    ActiveMQ Artemis Vert.x Integration
 
@@ -92,7 +92,7 @@
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
       
 
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/ActiveMQVertxLogger.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/ActiveMQVertxLogger.java
similarity index 94%
rename from integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/ActiveMQVertxLogger.java
rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/ActiveMQVertxLogger.java
index f21b269607..ec61a98667 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/ActiveMQVertxLogger.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/ActiveMQVertxLogger.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.vertx;
+package org.apache.activemq.artemis.integration.vertx;
 
-import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.ServerMessage;
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.LogMessage;
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java
similarity index 94%
rename from integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java
rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java
index 549f60c967..663733a721 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/IncomingVertxEventHandler.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.vertx;
+package org.apache.activemq.artemis.integration.vertx;
 
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.server.ConnectorService;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.utils.ConfigurationHelper;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.server.ConnectorService;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.artemis.utils.ConfigurationHelper;
 import org.vertx.java.core.Handler;
 import org.vertx.java.core.buffer.Buffer;
 import org.vertx.java.core.eventbus.EventBus;
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java
similarity index 91%
rename from integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java
rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java
index b7b91b3cfb..0520861d1f 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/OutgoingVertxEventHandler.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.vertx;
+package org.apache.activemq.artemis.integration.vertx;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.server.ConnectorService;
-import org.apache.activemq.core.server.Consumer;
-import org.apache.activemq.core.server.HandleStatus;
-import org.apache.activemq.core.server.MessageReference;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.utils.ConfigurationHelper;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.server.ConnectorService;
+import org.apache.activemq.artemis.core.server.Consumer;
+import org.apache.activemq.artemis.core.server.HandleStatus;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.utils.ConfigurationHelper;
 import org.vertx.java.core.buffer.Buffer;
 import org.vertx.java.core.eventbus.EventBus;
 import org.vertx.java.core.eventbus.ReplyException;
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxConstants.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxConstants.java
similarity index 98%
rename from integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxConstants.java
rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxConstants.java
index ff6ffd8637..671b46b52f 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxConstants.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxConstants.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.vertx;
+package org.apache.activemq.artemis.integration.vertx;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxIncomingConnectorServiceFactory.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxIncomingConnectorServiceFactory.java
similarity index 83%
rename from integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxIncomingConnectorServiceFactory.java
rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxIncomingConnectorServiceFactory.java
index 921069d49f..3d44f3aab1 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxIncomingConnectorServiceFactory.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxIncomingConnectorServiceFactory.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.vertx;
+package org.apache.activemq.artemis.integration.vertx;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.server.ConnectorService;
-import org.apache.activemq.core.server.ConnectorServiceFactory;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.server.ConnectorService;
+import org.apache.activemq.artemis.core.server.ConnectorServiceFactory;
 
 public class VertxIncomingConnectorServiceFactory implements ConnectorServiceFactory
 {
diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxOutgoingConnectorServiceFactory.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxOutgoingConnectorServiceFactory.java
similarity index 83%
rename from integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxOutgoingConnectorServiceFactory.java
rename to integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxOutgoingConnectorServiceFactory.java
index 23a45100f5..326d9ebd4f 100644
--- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/VertxOutgoingConnectorServiceFactory.java
+++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/artemis/integration/vertx/VertxOutgoingConnectorServiceFactory.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.integration.vertx;
+package org.apache.activemq.artemis.integration.vertx;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.server.ConnectorService;
-import org.apache.activemq.core.server.ConnectorServiceFactory;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.server.ConnectorService;
+import org.apache.activemq.artemis.core.server.ConnectorServiceFactory;
 
 public class VertxOutgoingConnectorServiceFactory implements ConnectorServiceFactory
 {
diff --git a/pom.xml b/pom.xml
index a1727a329c..a3a0cfb504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+
 
- 
+
       -Djava.util.logging.manager=org.jboss.logmanager.LogManager
          -Dlogging.configuration=file:${activemq.basedir}/tests/config/logging.properties
-         -Djava.library.path=${activemq.basedir}/activemq-native/bin/ -Djgroups.bind_addr=localhost
+         -Djava.library.path=${activemq.basedir}/artemis-native/bin/ -Djgroups.bind_addr=localhost
          -Djava.net.preferIPv4Stack=true
       
       ${project.basedir}
@@ -484,23 +485,23 @@
             true
          
          
-            activemq-dto
-            activemq-web
-            activemq-website
-            activemq-bootstrap
-            activemq-commons
-            activemq-selector
-            activemq-core-client
-            activemq-server
-            activemq-jms-client
-            activemq-jms-server
-            activemq-native
-            activemq-journal
-            activemq-ra
-            activemq-rest
-            activemq-tools
-            activemq-service-extensions
-            activemq-maven-plugin
+            artemis-dto
+            artemis-web
+            artemis-website
+            artemis-bootstrap
+            artemis-commons
+            artemis-selector
+            artemis-core-client
+            artemis-server
+            artemis-jms-client
+            artemis-jms-server
+            artemis-native
+            artemis-journal
+            artemis-ra
+            artemis-rest
+            artemis-tools
+            artemis-service-extensions
+            artemis-maven-plugin
             integration/activemq-spring-integration
             integration/activemq-aerogear-integration
             integration/activemq-vertx-integration
@@ -511,23 +512,23 @@
       
          release
          
-            activemq-dto
-            activemq-web
-            activemq-website
-            activemq-bootstrap
-            activemq-commons
-            activemq-selector
-            activemq-core-client
-            activemq-server
-            activemq-jms-client
-            activemq-jms-server
-            activemq-native
-            activemq-journal
-            activemq-ra
-            activemq-rest
-            activemq-tools
-            activemq-service-extensions
-            activemq-maven-plugin
+            artemis-dto
+            artemis-web
+            artemis-website
+            artemis-bootstrap
+            artemis-commons
+            artemis-selector
+            artemis-core-client
+            artemis-server
+            artemis-jms-client
+            artemis-jms-server
+            artemis-native
+            artemis-journal
+            artemis-ra
+            artemis-rest
+            artemis-tools
+            artemis-service-extensions
+            artemis-maven-plugin
             integration/activemq-spring-integration
             integration/activemq-aerogear-integration
             integration/activemq-vertx-integration
@@ -541,23 +542,23 @@
                Running this entire build could take up to 2 hours -->
          tests
          
-            activemq-dto
-            activemq-web
-            activemq-website
-            activemq-bootstrap
-            activemq-commons
-            activemq-selector
-            activemq-core-client
-            activemq-server
-            activemq-jms-client
-            activemq-jms-server
-            activemq-native
-            activemq-journal
-            activemq-ra
-            activemq-rest
-            activemq-tools
-            activemq-service-extensions
-            activemq-maven-plugin
+            artemis-dto
+            artemis-web
+            artemis-website
+            artemis-bootstrap
+            artemis-commons
+            artemis-selector
+            artemis-core-client
+            artemis-server
+            artemis-jms-client
+            artemis-jms-server
+            artemis-native
+            artemis-journal
+            artemis-ra
+            artemis-rest
+            artemis-tools
+            artemis-service-extensions
+            artemis-maven-plugin
             integration/activemq-spring-integration
             integration/activemq-aerogear-integration
             integration/activemq-vertx-integration
@@ -582,22 +583,22 @@
               This is used on PR checks on the Jenkins instance at build.apache.org -->
          fast-tests
          
-            activemq-dto
-            activemq-web
-            activemq-bootstrap
-            activemq-commons
-            activemq-selector
-            activemq-core-client
-            activemq-server
-            activemq-jms-client
-            activemq-jms-server
-            activemq-native
-            activemq-journal
-            activemq-ra
-            activemq-rest
-            activemq-tools
-            activemq-service-extensions
-            activemq-maven-plugin
+            artemis-dto
+            artemis-web
+            artemis-bootstrap
+            artemis-commons
+            artemis-selector
+            artemis-core-client
+            artemis-server
+            artemis-jms-client
+            artemis-jms-server
+            artemis-native
+            artemis-journal
+            artemis-ra
+            artemis-rest
+            artemis-tools
+            artemis-service-extensions
+            artemis-maven-plugin
             integration/activemq-spring-integration
             integration/activemq-aerogear-integration
             integration/activemq-vertx-integration
@@ -616,22 +617,22 @@
       
          examples
          
-            activemq-dto
-            activemq-web
-            activemq-bootstrap
-            activemq-commons
-            activemq-selector
-            activemq-core-client
-            activemq-server
-            activemq-jms-client
-            activemq-jms-server
-            activemq-native
-            activemq-journal
-            activemq-ra
-            activemq-rest
-            activemq-tools
-            activemq-service-extensions
-            activemq-maven-plugin
+            artemis-dto
+            artemis-web
+            artemis-bootstrap
+            artemis-commons
+            artemis-selector
+            artemis-core-client
+            artemis-server
+            artemis-jms-client
+            artemis-jms-server
+            artemis-native
+            artemis-journal
+            artemis-ra
+            artemis-rest
+            artemis-tools
+            artemis-service-extensions
+            artemis-maven-plugin
             integration/activemq-spring-integration
             integration/activemq-aerogear-integration
             integration/activemq-vertx-integration
@@ -673,7 +674,7 @@
             
                org.apache.maven.plugins
                maven-javadoc-plugin
-               
+
                2.9
             
             
@@ -792,7 +793,7 @@
             
             
                org.apache.activemq
-               activemq-maven-plugin
+               artemis-maven-plugin
                ${project.version}
             
          
diff --git a/tests/config/logging.properties b/tests/config/logging.properties
index 34052e3f4e..ce85dd82cb 100644
--- a/tests/config/logging.properties
+++ b/tests/config/logging.properties
@@ -17,19 +17,19 @@
 
 # Additional logger names to configure (root logger is always configured)
 # Root logger option
-loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.utils,org.apache.activemq.journal,org.apache.activemq.jms,org.apache.activemq.ra,org.apache.activemq.tests.unit,org.apache.activemq.tests.integration,org.apache.activemq.jms.tests
+loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms,org.apache.activemq.artemis.ra,org.apache.activemq.artemis.tests.unit,org.apache.activemq.artemis.tests.integration,org.apache.activemq.artemis.jms.tests
 
 # Root logger level
 logger.level=INFO
 # ActiveMQ logger levels
-logger.org.apache.activemq.core.server.level=INFO
-logger.org.apache.activemq.journal.level=INFO
-logger.org.apache.activemq.utils.level=INFO
-logger.org.apache.activemq.jms.level=INFO
-logger.org.apache.activemq.ra.level=INFO
-logger.org.apache.activemq.tests.unit.level=INFO
-logger.org.apache.activemq.tests.integration.level=DEBUG
-logger.org.apache.activemq.jms.tests.level=INFO
+logger.org.apache.activemq.artemis.core.server.level=INFO
+logger.org.apache.activemq.artemis.journal.level=INFO
+logger.org.apache.activemq.artemis.utils.level=INFO
+logger.org.apache.activemq.artemis.jms.level=INFO
+logger.org.apache.activemq.artemis.ra.level=INFO
+logger.org.apache.activemq.artemis.tests.unit.level=INFO
+logger.org.apache.activemq.artemis.tests.integration.level=DEBUG
+logger.org.apache.activemq.artemis.jms.tests.level=INFO
 
 # Root logger handlers
 logger.handlers=CONSOLE,TEST
@@ -51,7 +51,7 @@ handler.FILE.fileName=target/activemq.log
 handler.FILE.formatter=PATTERN
 
 # Console handler configuration
-handler.TEST=org.apache.activemq.logs.AssertionLoggerHandler
+handler.TEST=org.apache.activemq.artemis.logs.AssertionLoggerHandler
 handler.TEST.level=TRACE
 handler.TEST.formatter=PATTERN
 
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index 0450e4043f..df7486955a 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -24,8 +24,8 @@
    4.0.0
    
       org.apache.activemq.tests
-      activemq-tests-pom
-      10.0.0-SNAPSHOT
+      artemis-tests-pom
+      1.0.0-SNAPSHOT
    
 
    extra-tests
@@ -81,14 +81,14 @@
       
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
          test
          test-jar
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
          test
          test-jar
@@ -109,22 +109,22 @@
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
          org.apache.activemq
-         activemq-ra
+         artemis-ra
          ${project.version}
       
       
          org.apache.activemq
-         activemq-bootstrap
+         artemis-bootstrap
          ${project.version}
       
       
@@ -174,7 +174,7 @@
       
       
          org.apache.activemq
-         activemq-commons
+         artemis-commons
          ${project.version}
          test
       
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/ExtrasTestLogger.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/ExtrasTestLogger.java
similarity index 95%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/ExtrasTestLogger.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/ExtrasTestLogger.java
index 92f7035527..b18e86f392 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/ExtrasTestLogger.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/ExtrasTestLogger.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras;
+package org.apache.activemq.artemis.tests.extras;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ActiveMQMessageHandlerTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQMessageHandlerTest.java
similarity index 90%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ActiveMQMessageHandlerTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQMessageHandlerTest.java
index d4ec713d61..f2dc858eec 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ActiveMQMessageHandlerTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQMessageHandlerTest.java
@@ -14,29 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
-
-import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
-import com.arjuna.ats.arjuna.coordinator.TxControl;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.ra.inflow.ActiveMQActivationSpec;
-import org.apache.activemq.tests.integration.ra.ActiveMQRATestBase;
-import org.jboss.byteman.contrib.bmunit.BMRule;
-import org.jboss.byteman.contrib.bmunit.BMRules;
-import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import javax.jms.Message;
 import javax.resource.ResourceException;
@@ -50,6 +28,28 @@ import java.lang.reflect.Method;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
+import com.arjuna.ats.arjuna.coordinator.TxControl;
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec;
+import org.apache.activemq.artemis.tests.integration.ra.ActiveMQRATestBase;
+import org.jboss.byteman.contrib.bmunit.BMRule;
+import org.jboss.byteman.contrib.bmunit.BMRules;
+import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 @RunWith(BMUnitRunner.class)
 public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase
 {
@@ -74,10 +74,10 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase
                @BMRule
                      (
                            name = "interrupt",
-                           targetClass = "org.apache.activemq.core.protocol.core.impl.ActiveMQSessionContext",
+                           targetClass = "org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQSessionContext",
                            targetMethod = "xaEnd",
                            targetLocation = "ENTRY",
-                           action = "org.apache.activemq.tests.extras.byteman.ActiveMQMessageHandlerTest.interrupt();"
+                           action = "org.apache.activemq.artemis.tests.extras.byteman.ActiveMQMessageHandlerTest.interrupt();"
                      )
             }
    )
@@ -151,10 +151,10 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase
                            @BMRule
                                  (
                                        name = "interrupt",
-                                       targetClass = "org.apache.activemq.core.protocol.core.impl.ActiveMQSessionContext",
+                                       targetClass = "org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQSessionContext",
                                        targetMethod = "xaEnd",
                                        targetLocation = "ENTRY",
-                                       action = "org.apache.activemq.tests.extras.byteman.ActiveMQMessageHandlerTest.interrupt();"
+                                       action = "org.apache.activemq.artemis.tests.extras.byteman.ActiveMQMessageHandlerTest.interrupt();"
                                  )
                      }
          )
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/BMFailoverTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BMFailoverTest.java
similarity index 83%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/BMFailoverTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BMFailoverTest.java
index 4ae2d0d00d..7a726cbedc 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/BMFailoverTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BMFailoverTest.java
@@ -14,34 +14,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.api.core.ActiveMQTransactionOutcomeUnknownException;
-import org.apache.activemq.api.core.ActiveMQTransactionRolledBackException;
-import org.apache.activemq.api.core.ActiveMQUnBlockedException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.ActiveMQClientMessageBundle;
-import org.apache.activemq.core.client.impl.ClientMessageImpl;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.tests.integration.cluster.failover.FailoverTestBase;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.ActiveMQTransactionOutcomeUnknownException;
+import org.apache.activemq.artemis.api.core.ActiveMQTransactionRolledBackException;
+import org.apache.activemq.artemis.api.core.ActiveMQUnBlockedException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle;
+import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.tests.integration.cluster.failover.FailoverTestBase;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -108,10 +108,10 @@ public class BMFailoverTest extends FailoverTestBase
                      @BMRule
                            (
                                  name = "trace ActiveMQSessionContext xaEnd",
-                                 targetClass = "org.apache.activemq.core.protocol.core.impl.ActiveMQSessionContext",
+                                 targetClass = "org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQSessionContext",
                                  targetMethod = "xaEnd",
                                  targetLocation = "AT EXIT",
-                                 action = "org.apache.activemq.tests.extras.byteman.BMFailoverTest.stopAndThrow()"
+                                 action = "org.apache.activemq.artemis.tests.extras.byteman.BMFailoverTest.stopAndThrow()"
                            )
                }
    )
@@ -199,10 +199,10 @@ public class BMFailoverTest extends FailoverTestBase
                @BMRule
                   (
                      name = "trace clientsessionimpl commit",
-                     targetClass = "org.apache.activemq.core.client.impl.ClientSessionImpl",
+                     targetClass = "org.apache.activemq.artemis.core.client.impl.ClientSessionImpl",
                      targetMethod = "start(javax.transaction.xa.Xid, int)",
                      targetLocation = "AT EXIT",
-                     action = "org.apache.activemq.tests.extras.byteman.BMFailoverTest.serverToStop.getServer().stop(true)"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.BMFailoverTest.serverToStop.getServer().stop(true)"
                   )
             }
       )
@@ -302,10 +302,10 @@ public class BMFailoverTest extends FailoverTestBase
                @BMRule
                   (
                      name = "trace clientsessionimpl commit",
-                     targetClass = "org.apache.activemq.core.client.impl.ClientSessionImpl",
+                     targetClass = "org.apache.activemq.artemis.core.client.impl.ClientSessionImpl",
                      targetMethod = "commit",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq.tests.extras.byteman.BMFailoverTest.serverToStop.getServer().stop(true)"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.BMFailoverTest.serverToStop.getServer().stop(true)"
                   )
             }
       )
@@ -343,10 +343,10 @@ public class BMFailoverTest extends FailoverTestBase
                @BMRule
                   (
                      name = "trace clientsessionimpl commit",
-                     targetClass = "org.apache.activemq.core.client.impl.ClientSessionImpl",
+                     targetClass = "org.apache.activemq.artemis.core.client.impl.ClientSessionImpl",
                      targetMethod = "commit",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq.tests.extras.byteman.BMFailoverTest.serverToStop.getServer().stop(true)"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.BMFailoverTest.serverToStop.getServer().stop(true)"
                   )
             }
       )
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java
similarity index 87%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java
index bf97f5a46d..300842110e 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.BridgeConfiguration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.cluster.impl.BridgeImpl;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.BridgeConfiguration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.cluster.impl.BridgeImpl;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
 import org.junit.Test;
@@ -57,7 +57,7 @@ public class BridgeServerLocatorConfigurationTest extends ServiceTestBase
 
    @Test
    @BMRule(name = "check connection ttl",
-            targetClass = "org.apache.activemq.tests.extras.byteman.BridgeServerLocatorConfigurationTest",
+            targetClass = "org.apache.activemq.artemis.tests.extras.byteman.BridgeServerLocatorConfigurationTest",
             targetMethod = "getBridgeTTL(ActiveMQServer, String)", targetLocation = "EXIT",
             action = "$! = $0.getConfiguredBridge($1).serverLocator.getConnectionTTL();")
    /**
@@ -76,7 +76,7 @@ public class BridgeServerLocatorConfigurationTest extends ServiceTestBase
       Map server1Params = new HashMap();
       if (isNetty())
       {
-         server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
+         server1Params.put("port", org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
       }
       else
       {
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ClosingConnectionTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
similarity index 82%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ClosingConnectionTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
index cd3ee24999..4007b5b5ba 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ClosingConnectionTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.ActiveMQServerControl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.JournalType;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.JournalType;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -125,10 +125,10 @@ public class ClosingConnectionTest extends ServiceTestBase
                @BMRule
                   (
                      name = "rule to kill connection",
-                     targetClass = "org.apache.activemq.core.journal.impl.NIOSequentialFile",
+                     targetClass = "org.apache.activemq.artemis.core.journal.impl.NIOSequentialFile",
                      targetMethod = "open(int, boolean)",
                      targetLocation = "AT INVOKE java.nio.channels.FileChannel.size()",
-                     action = "org.apache.activemq.tests.extras.byteman.ClosingConnectionTest.killConnection();"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.ClosingConnectionTest.killConnection();"
 
                   )
             }
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ClusteredGroupingTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClusteredGroupingTest.java
similarity index 84%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ClusteredGroupingTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClusteredGroupingTest.java
index 922a89b517..4aea3bcc74 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ClusteredGroupingTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClusteredGroupingTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQNonExistentQueueException;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.management.ManagementHelper;
-import org.apache.activemq.api.core.management.CoreNotificationType;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration;
-import org.apache.activemq.core.server.group.impl.Response;
-import org.apache.activemq.core.server.management.Notification;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.management.ManagementHelper;
+import org.apache.activemq.artemis.api.core.management.CoreNotificationType;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
+import org.apache.activemq.artemis.core.server.group.impl.Response;
+import org.apache.activemq.artemis.core.server.management.Notification;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -48,18 +48,18 @@ public class ClusteredGroupingTest extends ClusterTestBase
                @BMRule
                   (
                      name = "blow-up",
-                     targetClass = "org.apache.activemq.core.server.group.impl.LocalGroupingHandler",
+                     targetClass = "org.apache.activemq.artemis.core.server.group.impl.LocalGroupingHandler",
                      targetMethod = "removeGrouping",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq.tests.extras.byteman.ClusteredGroupingTest.pause($1);"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.ClusteredGroupingTest.pause($1);"
                   ),
                @BMRule
                   (
                      name = "blow-up2",
-                     targetClass = "org.apache.activemq.core.server.group.impl.GroupHandlingAbstract",
+                     targetClass = "org.apache.activemq.artemis.core.server.group.impl.GroupHandlingAbstract",
                      targetMethod = "forceRemove",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq.tests.extras.byteman.ClusteredGroupingTest.restart2();"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.ClusteredGroupingTest.restart2();"
                   )
             }
       )
@@ -125,16 +125,16 @@ public class ClusteredGroupingTest extends ClusterTestBase
                @BMRule
                   (
                      name = "blow-up",
-                     targetClass = "org.apache.activemq.core.server.group.impl.RemoteGroupingHandler",
+                     targetClass = "org.apache.activemq.artemis.core.server.group.impl.RemoteGroupingHandler",
                      targetMethod = "onNotification",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq.tests.extras.byteman.ClusteredGroupingTest.pause2($1);"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.ClusteredGroupingTest.pause2($1);"
                   ),
                @BMRule(name = "blow-up2",
-                       targetClass = "org.apache.activemq.core.server.group.impl.RemoteGroupingHandler",
+                       targetClass = "org.apache.activemq.artemis.core.server.group.impl.RemoteGroupingHandler",
                        targetMethod = "remove",
                        targetLocation = "ENTRY",
-                       action = "org.apache.activemq.tests.extras.byteman.ClusteredGroupingTest.restart2();")
+                       action = "org.apache.activemq.artemis.tests.extras.byteman.ClusteredGroupingTest.restart2();")
             }
       )
    public void test3serversLocalGoesDown() throws Exception
@@ -210,16 +210,16 @@ public class ClusteredGroupingTest extends ClusterTestBase
                @BMRule
                   (
                      name = "blow-up",
-                     targetClass = "org.apache.activemq.core.server.group.impl.LocalGroupingHandler",
+                     targetClass = "org.apache.activemq.artemis.core.server.group.impl.LocalGroupingHandler",
                      targetMethod = "onNotification",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq.tests.extras.byteman.ClusteredGroupingTest.pause2($1);"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.ClusteredGroupingTest.pause2($1);"
                   ),
                @BMRule(name = "blow-up2",
-                       targetClass = "org.apache.activemq.core.server.group.impl.LocalGroupingHandler",
+                       targetClass = "org.apache.activemq.artemis.core.server.group.impl.LocalGroupingHandler",
                        targetMethod = "remove",
                        targetLocation = "ENTRY",
-                       action = "org.apache.activemq.tests.extras.byteman.ClusteredGroupingTest.restart2();")
+                       action = "org.apache.activemq.artemis.tests.extras.byteman.ClusteredGroupingTest.restart2();")
             }
       )
    public void testLocal3serversLocalGoesDown() throws Exception
@@ -295,16 +295,16 @@ public class ClusteredGroupingTest extends ClusterTestBase
                @BMRule
                   (
                      name = "blow-up",
-                     targetClass = "org.apache.activemq.core.server.group.impl.LocalGroupingHandler",
+                     targetClass = "org.apache.activemq.artemis.core.server.group.impl.LocalGroupingHandler",
                      targetMethod = "onNotification",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq.tests.extras.byteman.ClusteredGroupingTest.pause2($1);"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.ClusteredGroupingTest.pause2($1);"
                   ),
                @BMRule(name = "blow-up2",
-                       targetClass = "org.apache.activemq.core.server.group.impl.LocalGroupingHandler",
+                       targetClass = "org.apache.activemq.artemis.core.server.group.impl.LocalGroupingHandler",
                        targetMethod = "remove",
                        targetLocation = "ENTRY",
-                       action = "org.apache.activemq.tests.extras.byteman.ClusteredGroupingTest.restart2();")
+                       action = "org.apache.activemq.artemis.tests.extras.byteman.ClusteredGroupingTest.restart2();")
             }
       )
    public void testLocal4serversLocalGoesDown() throws Exception
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/GroupingTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java
similarity index 90%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/GroupingTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java
index 2f2c4b95c8..3cfcfcdc42 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/GroupingTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,10 +25,10 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -76,10 +76,10 @@ public class GroupingTest extends JMSTestBase
                @BMRule
                   (
                      name = "trace clientsessionimpl commit",
-                     targetClass = "org.apache.activemq.core.server.impl.ServerSessionImpl",
+                     targetClass = "org.apache.activemq.artemis.core.server.impl.ServerSessionImpl",
                      targetMethod = "rollback",
                      targetLocation = "EXIT",
-                     action = "org.apache.activemq.tests.extras.byteman.GroupingTest.pause();"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.GroupingTest.pause();"
                   )
             }
       )
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/HierarchicalObjectRepositoryTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/HierarchicalObjectRepositoryTest.java
similarity index 92%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/HierarchicalObjectRepositoryTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/HierarchicalObjectRepositoryTest.java
index e1b5b72bbc..e9c2e47f3c 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/HierarchicalObjectRepositoryTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/HierarchicalObjectRepositoryTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository;
+import org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -33,9 +33,9 @@ import org.junit.runner.RunWith;
 
 @RunWith(BMUnitRunner.class)
 @BMRules(rules = { @BMRule(name = "modify map during iteration",
-         targetClass = "org.apache.activemq.core.settings.impl.HierarchicalObjectRepository",
+         targetClass = "org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository",
          targetMethod = "getPossibleMatches(String)", targetLocation = "AT INVOKE java.util.HashMap.put",
-         action = "org.apache.activemq.tests.extras.byteman.HierarchicalObjectRepositoryTest.bum()"), })
+         action = "org.apache.activemq.artemis.tests.extras.byteman.HierarchicalObjectRepositoryTest.bum()"), })
 public class HierarchicalObjectRepositoryTest
 {
    private static final String A = "a.";
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/JMSBridgeReconnectionTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/JMSBridgeReconnectionTest.java
similarity index 82%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/JMSBridgeReconnectionTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/JMSBridgeReconnectionTest.java
index 4ac125a38b..a48f9ad622 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/JMSBridgeReconnectionTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/JMSBridgeReconnectionTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
-import org.apache.activemq.core.client.impl.ClientProducerCredits;
-import org.apache.activemq.core.message.impl.MessageInternal;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage;
-import org.apache.activemq.jms.bridge.ConnectionFactoryFactory;
-import org.apache.activemq.jms.bridge.QualityOfServiceMode;
-import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.tests.extras.jms.bridge.BridgeTestBase;
+import org.apache.activemq.artemis.core.client.impl.ClientProducerCredits;
+import org.apache.activemq.artemis.core.message.impl.MessageInternal;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage;
+import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory;
+import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode;
+import org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.tests.extras.jms.bridge.BridgeTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -46,18 +46,18 @@ public class JMSBridgeReconnectionTest extends BridgeTestBase
                            @BMRule
                                  (
                                        name = "trace clientsessionimpl send",
-                                       targetClass = "org.apache.activemq.core.protocol.core.impl.ChannelImpl",
+                                       targetClass = "org.apache.activemq.artemis.core.protocol.core.impl.ChannelImpl",
                                        targetMethod = "send",
                                        targetLocation = "ENTRY",
-                                       action = "org.apache.activemq.tests.extras.byteman.JMSBridgeReconnectionTest.pause($1);"
+                                       action = "org.apache.activemq.artemis.tests.extras.byteman.JMSBridgeReconnectionTest.pause($1);"
                                  ),
                            @BMRule
                                  (
                                        name = "trace sendRegularMessage",
-                                       targetClass = "org.apache.activemq.core.client.impl.ClientProducerImpl",
+                                       targetClass = "org.apache.activemq.artemis.core.client.impl.ClientProducerImpl",
                                        targetMethod = "sendRegularMessage",
                                        targetLocation = "ENTRY",
-                                       action = "org.apache.activemq.tests.extras.byteman.JMSBridgeReconnectionTest.pause2($1,$2,$3);"
+                                       action = "org.apache.activemq.artemis.tests.extras.byteman.JMSBridgeReconnectionTest.pause2($1,$2,$3);"
                                  )
                      }
          )
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/LatencyTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LatencyTest.java
similarity index 85%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/LatencyTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LatencyTest.java
index 68914fe69a..deb8b948ec 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/LatencyTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LatencyTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/MessageCopyTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/MessageCopyTest.java
similarity index 86%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/MessageCopyTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/MessageCopyTest.java
index 9969307942..0a7344707c 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/MessageCopyTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/MessageCopyTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -44,7 +44,7 @@ public class MessageCopyTest
                @BMRule
                   (
                      name = "message-copy0",
-                     targetClass = "org.apache.activemq.core.server.impl.ServerMessageImpl",
+                     targetClass = "org.apache.activemq.artemis.core.server.impl.ServerMessageImpl",
                      targetMethod = "copy()",
                      targetLocation = "ENTRY",
                      action = "System.out.println(\"copy\"), waitFor(\"encode-done\")"
@@ -52,15 +52,15 @@ public class MessageCopyTest
                @BMRule
                   (
                      name = "message-copy-done",
-                     targetClass = "org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage",
-                     targetMethod = "encode(org.apache.activemq.spi.core.protocol.RemotingConnection)",
+                     targetClass = "org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage",
+                     targetMethod = "encode(org.apache.activemq.artemis.spi.core.protocol.RemotingConnection)",
                      targetLocation = "EXIT",
                      action = "System.out.println(\"encodeDone\"), signalWake(\"encode-done\", true)"
                   ),
                @BMRule
                   (
                      name = "message-copy1",
-                     targetClass = "org.apache.activemq.core.buffers.impl.ChannelBufferWrapper",
+                     targetClass = "org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper",
                      targetMethod = "copy(int, int)",
                      condition = "Thread.currentThread().getName().equals(\"T1\")",
                      targetLocation = "EXIT",
@@ -68,7 +68,7 @@ public class MessageCopyTest
                   ),
                @BMRule(
                   name = "JMSServer.stop wait-init",
-                  targetClass = "org.apache.activemq.tests.extras.byteman.MessageCopyTest",
+                  targetClass = "org.apache.activemq.artemis.tests.extras.byteman.MessageCopyTest",
                   targetMethod = "simulateRead",
                   targetLocation = "EXIT",
                   action = "signalWake(\"finish-read\", true)"
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/OrphanedConsumerTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/OrphanedConsumerTest.java
similarity index 81%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/OrphanedConsumerTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/OrphanedConsumerTest.java
index af0a7be3c7..efda5c94bc 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/OrphanedConsumerTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/OrphanedConsumerTest.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -126,20 +126,20 @@ public class OrphanedConsumerTest extends ServiceTestBase
                @BMRule
                   (
                      name = "closeExit",
-                     targetClass = "org.apache.activemq.core.server.impl.ServerConsumerImpl",
+                     targetClass = "org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl",
                      targetMethod = "close",
                      targetLocation = "AT EXIT",
-                     condition = "org.apache.activemq.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()",
+                     condition = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()",
                      action = "System.out.println(\"throwing stuff\");throw new InterruptedException()"
                   ),
                @BMRule
                   (
                      name = "closeEnter",
-                     targetClass = "org.apache.activemq.core.server.impl.ServerConsumerImpl",
+                     targetClass = "org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl",
                      targetMethod = "close",
                      targetLocation = "ENTRY",
-                     condition = "org.apache.activemq.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()",
-                     action = "org.apache.activemq.tests.extras.byteman.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()"
+                     condition = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()",
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()"
                   )
 
             }
@@ -165,20 +165,20 @@ public class OrphanedConsumerTest extends ServiceTestBase
                @BMRule
                   (
                      name = "closeExit",
-                     targetClass = "org.apache.activemq.core.server.impl.ServerConsumerImpl",
+                     targetClass = "org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl",
                      targetMethod = "close",
                      targetLocation = "AT EXIT",
-                     condition = "org.apache.activemq.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()",
+                     condition = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()",
                      action = "System.out.println(\"throwing stuff\");throw new InterruptedException()"
                   ),
                @BMRule
                   (
                      name = "closeEnter",
-                     targetClass = "org.apache.activemq.core.server.impl.ServerConsumerImpl",
+                     targetClass = "org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl",
                      targetMethod = "close",
                      targetLocation = "ENTRY",
-                     condition = "org.apache.activemq.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()",
-                     action = "org.apache.activemq.tests.extras.byteman.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()"
+                     condition = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()",
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()"
                   )
 
             }
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/PagingLeakTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
similarity index 82%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/PagingLeakTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
index 2da8445a26..bbf43d5b3a 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/PagingLeakTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.paging.cursor.impl.PagePositionImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.paging.cursor.impl.PagePositionImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -73,18 +73,18 @@ public class PagingLeakTest extends ServiceTestBase
                @BMRule
                   (
                      name = "newPosition",
-                     targetClass = "org.apache.activemq.core.paging.cursor.impl.PagePositionImpl",
+                     targetClass = "org.apache.activemq.artemis.core.paging.cursor.impl.PagePositionImpl",
                      targetMethod = "()",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq.tests.extras.byteman.PagingLeakTest.newPosition()"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.PagingLeakTest.newPosition()"
                   ),
                @BMRule
                   (
                      name = "finalPosition",
-                     targetClass = "org.apache.activemq.core.paging.cursor.impl.PagePositionImpl",
+                     targetClass = "org.apache.activemq.artemis.core.paging.cursor.impl.PagePositionImpl",
                      targetMethod = "finalize",
                      targetLocation = "ENTRY",
-                     action = "org.apache.activemq.tests.extras.byteman.PagingLeakTest.deletePosition()"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.PagingLeakTest.deletePosition()"
                   )
             }
       )
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ReplicationBackupTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java
similarity index 84%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ReplicationBackupTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java
index 15c987c210..debd95b0e2 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ReplicationBackupTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ReplicatedBackupUtils;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ReplicatedBackupUtils;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -50,10 +50,10 @@ public class ReplicationBackupTest extends ServiceTestBase
                @BMRule
                   (
                      name = "prevent backup annoucement",
-                     targetClass = "org.apache.activemq.core.server.impl.SharedNothingLiveActivation",
+                     targetClass = "org.apache.activemq.artemis.core.server.impl.SharedNothingLiveActivation",
                      targetMethod = "run",
                      targetLocation = "AT EXIT",
-                     action = "org.apache.activemq.tests.extras.byteman.ReplicationBackupTest.breakIt();"
+                     action = "org.apache.activemq.artemis.tests.extras.byteman.ReplicationBackupTest.breakIt();"
                   )
             }
       )
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownFailoverTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownFailoverTest.java
similarity index 89%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownFailoverTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownFailoverTest.java
index d06b093a01..a4c3b40664 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownFailoverTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownFailoverTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.core.config.ScaleDownConfiguration;
-import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.core.config.ScaleDownConfiguration;
+import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
 import org.junit.After;
@@ -100,11 +100,11 @@ public class ScaleDownFailoverTest extends ClusterTestBase
    @BMRule
       (
          name = "blow-up",
-         targetClass = "org.apache.activemq.api.core.client.ServerLocator",
-         targetMethod = "createSessionFactory(org.apache.activemq.api.core.TransportConfiguration, int, boolean)",
+         targetClass = "org.apache.activemq.artemis.api.core.client.ServerLocator",
+         targetMethod = "createSessionFactory(org.apache.activemq.artemis.api.core.TransportConfiguration, int, boolean)",
          isInterface = true,
          targetLocation = "ENTRY",
-         action = "org.apache.activemq.tests.extras.byteman.ScaleDownFailoverTest.fail($1);"
+         action = "org.apache.activemq.artemis.tests.extras.byteman.ScaleDownFailoverTest.fail($1);"
       )
    public void testScaleDownWhenFirstServerFails() throws Exception
    {
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownFailureTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownFailureTest.java
similarity index 88%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownFailureTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownFailureTest.java
index fbf46f16b2..4f60723b19 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownFailureTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownFailureTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.core.config.ScaleDownConfiguration;
-import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.core.config.ScaleDownConfiguration;
+import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
 import org.junit.After;
@@ -78,8 +78,8 @@ public class ScaleDownFailureTest extends ClusterTestBase
    @BMRule
       (
          name = "blow-up",
-         targetClass = "org.apache.activemq.api.core.client.ServerLocator",
-         targetMethod = "createSessionFactory(org.apache.activemq.api.core.TransportConfiguration, int, boolean)",
+         targetClass = "org.apache.activemq.artemis.api.core.client.ServerLocator",
+         targetMethod = "createSessionFactory(org.apache.activemq.artemis.api.core.TransportConfiguration, int, boolean)",
          isInterface = true,
          targetLocation = "ENTRY",
          action = "throw new Exception()"
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownGroupedFailoverTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailoverTest.java
similarity index 94%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownGroupedFailoverTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailoverTest.java
index e86d4d69b5..de2b4251f5 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownGroupedFailoverTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 public class ScaleDownGroupedFailoverTest extends ScaleDownFailoverTest
 {
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownGroupedFailureTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailureTest.java
similarity index 94%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownGroupedFailureTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailureTest.java
index 87dd577688..48bb1ea624 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/ScaleDownGroupedFailureTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailureTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 public class ScaleDownGroupedFailureTest extends ScaleDownFailureTest
 {
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/StartStopDeadlockTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StartStopDeadlockTest.java
similarity index 82%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/StartStopDeadlockTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StartStopDeadlockTest.java
index 86507aadcb..d45606c3f5 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/StartStopDeadlockTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StartStopDeadlockTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -54,7 +54,7 @@ public class StartStopDeadlockTest extends ServiceTestBase
                @BMRule
                   (
                      name = "Server.start wait-init",
-                     targetClass = "org.apache.activemq.core.server.impl.ActiveMQServerImpl",
+                     targetClass = "org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl",
                      targetMethod = "initialisePart2",
                      targetLocation = "ENTRY",
                      condition = "incrementCounter(\"server-Init\") == 2",
@@ -62,14 +62,14 @@ public class StartStopDeadlockTest extends ServiceTestBase
                   ),
                @BMRule(
                   name = "JMSServer.stop wait-init",
-                  targetClass = "org.apache.activemq.jms.server.impl.JMSServerManagerImpl",
+                  targetClass = "org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl",
                   targetMethod = "stop",
                   targetLocation = "ENTRY",
                   action = "signalWake(\"start-init\", true)"
                ),
                @BMRule(
                   name = "StartStopDeadlockTest tearDown",
-                  targetClass = "org.apache.activemq.tests.extras.byteman.StartStopDeadlockTest",
+                  targetClass = "org.apache.activemq.artemis.tests.extras.byteman.StartStopDeadlockTest",
                   targetMethod = "tearDown",
                   targetLocation = "ENTRY",
                   action = "deleteCounter(\"server-Init\")"
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/StompInternalStateTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java
similarity index 77%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/StompInternalStateTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java
index 12037f4059..ebd57b6b49 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/byteman/StompInternalStateTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.byteman;
+package org.apache.activemq.artemis.tests.extras.byteman;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.CoreNotificationType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.management.Notification;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.CoreNotificationType;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.management.Notification;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.jboss.byteman.contrib.bmunit.BMRule;
 import org.jboss.byteman.contrib.bmunit.BMRules;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -58,10 +58,10 @@ public class StompInternalStateTest extends ServiceTestBase
                @BMRule
                   (
                      name = "StompProtocolManager Leak Server Rule",
-                     targetClass = "org.apache.activemq.core.protocol.stomp.StompProtocolManager",
-                     targetMethod = "onNotification(org.apache.activemq.core.server.management.Notification)",
+                     targetClass = "org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManager",
+                     targetMethod = "onNotification(org.apache.activemq.artemis.core.server.management.Notification)",
                      targetLocation = "EXIT",
-                     helper = "org.apache.activemq.tests.extras.byteman.StompInternalStateTest",
+                     helper = "org.apache.activemq.artemis.tests.extras.byteman.StompInternalStateTest",
                      action = "verifyBindingAddRemove($1, $0.destinations)"
                   )
             }
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/BridgeTestBase.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
similarity index 92%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/BridgeTestBase.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
index 1ffe8a976b..668db2da93 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/BridgeTestBase.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.jms.bridge;
+package org.apache.activemq.artemis.tests.extras.jms.bridge;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -37,30 +37,30 @@ import java.util.Set;
 import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
 import com.arjuna.ats.arjuna.coordinator.TxControl;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.api.jms.management.JMSQueueControl;
-import org.apache.activemq.api.jms.management.TopicControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.management.ManagementService;
-import org.apache.activemq.jms.bridge.ConnectionFactoryFactory;
-import org.apache.activemq.jms.bridge.DestinationFactory;
-import org.apache.activemq.jms.bridge.QualityOfServiceMode;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQMessage;
-import org.apache.activemq.jms.client.ActiveMQXAConnectionFactory;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
+import org.apache.activemq.artemis.api.jms.management.TopicControl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.management.ManagementService;
+import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory;
+import org.apache.activemq.artemis.jms.bridge.DestinationFactory;
+import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/ClusteredBridgeTestBase.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
similarity index 82%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
index f52963bc07..5f32f9f2b3 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.jms.bridge;
+package org.apache.activemq.artemis.tests.extras.jms.bridge;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
@@ -27,33 +27,33 @@ import java.util.concurrent.TimeUnit;
 
 import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
 import com.arjuna.ats.arjuna.coordinator.TxControl;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.FailoverEventListener;
-import org.apache.activemq.api.core.client.FailoverEventType;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.bridge.ConnectionFactoryFactory;
-import org.apache.activemq.jms.bridge.DestinationFactory;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.unit.util.InVMContext;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.FailoverEventListener;
+import org.apache.activemq.artemis.api.core.client.FailoverEventType;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory;
+import org.apache.activemq.artemis.jms.bridge.DestinationFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.unit.util.InVMContext;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/JMSBridgeClusteredTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeClusteredTest.java
similarity index 95%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/JMSBridgeClusteredTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeClusteredTest.java
index 490e36cab6..59b67776f6 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/JMSBridgeClusteredTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeClusteredTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.jms.bridge;
+package org.apache.activemq.artemis.tests.extras.jms.bridge;
 
 import javax.transaction.TransactionManager;
 
 import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.jms.bridge.ConnectionFactoryFactory;
-import org.apache.activemq.jms.bridge.DestinationFactory;
-import org.apache.activemq.jms.bridge.QualityOfServiceMode;
-import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory;
+import org.apache.activemq.artemis.jms.bridge.DestinationFactory;
+import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode;
+import org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java
similarity index 95%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java
index 2766227d73..8a6c3cec3b 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.jms.bridge;
+package org.apache.activemq.artemis.tests.extras.jms.bridge;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.jms.bridge.ConnectionFactoryFactory;
-import org.apache.activemq.jms.bridge.QualityOfServiceMode;
-import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl;
-import org.apache.activemq.jms.client.ActiveMQXAConnectionFactory;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.ra.DummyTransactionManager;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory;
+import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode;
+import org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl;
+import org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.ra.DummyTransactionManager;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/JMSBridgeTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
similarity index 99%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/JMSBridgeTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
index ceddca68ce..a9eb302a67 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/JMSBridgeTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.jms.bridge;
+package org.apache.activemq.artemis.tests.extras.jms.bridge;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -34,15 +34,15 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.jms.ActiveMQJMSConstants;
-import org.apache.activemq.jms.bridge.ConnectionFactoryFactory;
-import org.apache.activemq.jms.bridge.QualityOfServiceMode;
-import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl;
-import org.apache.activemq.jms.client.ActiveMQMessage;
-import org.apache.activemq.service.extensions.ServiceUtils;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.ra.DummyTransactionManager;
-import org.apache.activemq.utils.DefaultSensitiveStringCodec;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
+import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory;
+import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode;
+import org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl;
+import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
+import org.apache.activemq.artemis.service.extensions.ServiceUtils;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.ra.DummyTransactionManager;
+import org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/TransactionManagerLocatorImpl.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/TransactionManagerLocatorImpl.java
similarity index 88%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/TransactionManagerLocatorImpl.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/TransactionManagerLocatorImpl.java
index e44e37c76f..acff62f972 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/bridge/TransactionManagerLocatorImpl.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/TransactionManagerLocatorImpl.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.tests.extras.jms.bridge;
+package org.apache.activemq.artemis.tests.extras.jms.bridge;
 
 import javax.transaction.TransactionManager;
 
-import org.apache.activemq.service.extensions.transactions.TransactionManagerLocator;
+import org.apache.activemq.artemis.service.extensions.transactions.TransactionManagerLocator;
 
 public class TransactionManagerLocatorImpl implements TransactionManagerLocator
 {
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/JMSXDeliveryCountTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
similarity index 99%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/JMSXDeliveryCountTest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
index 02ac3542e6..311b71f082 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/JMSXDeliveryCountTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.jms.xa;
+package org.apache.activemq.artemis.tests.extras.jms.xa;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -38,8 +38,8 @@ import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
 import com.arjuna.ats.arjuna.coordinator.TxControl;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/XATest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
similarity index 99%
rename from tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/XATest.java
rename to tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
index 2971f7ec78..bc41803a45 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/XATest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.extras.jms.xa;
+package org.apache.activemq.artemis.tests.extras.jms.xa;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -36,10 +36,10 @@ import javax.transaction.xa.Xid;
 import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
 import com.arjuna.ats.arjuna.coordinator.TxControl;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.tests.extras.ExtrasTestLogger;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.tests.extras.ExtrasTestLogger;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.jboss.tm.TxUtils;
 import org.junit.After;
 import org.junit.Assert;
diff --git a/tests/extra-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator b/tests/extra-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator
index e9ef6bf146..73373b1f2c 100644
--- a/tests/extra-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator
+++ b/tests/extra-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator
@@ -1 +1 @@
-org.apache.activemq.tests.extras.jms.bridge.TransactionManagerLocatorImpl
+org.apache.activemq.artemis.tests.extras.jms.bridge.TransactionManagerLocatorImpl
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 971cd01f39..6f850e09c9 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -18,8 +18,8 @@
    4.0.0
    
       org.apache.activemq.tests
-      activemq-tests-pom
-      10.0.0-SNAPSHOT
+      artemis-tests-pom
+      1.0.0-SNAPSHOT
    
 
    integration-tests
@@ -35,7 +35,7 @@
    
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
          test
          test-jar
@@ -49,19 +49,19 @@
       
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
          test
          test-jar
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
          
             
@@ -73,57 +73,57 @@
       
       
          org.apache.activemq
-         activemq-ra
+         artemis-ra
          ${project.version}
       
       
          org.apache.activemq
-         activemq-bootstrap
+         artemis-bootstrap
          ${project.version}
       
       
          org.apache.activemq
-         activemq-commons
+         artemis-commons
          ${project.version}
       
       
          org.apache.activemq
-         activemq-tools
+         artemis-tools
          ${project.version}
       
       
          org.apache.activemq
-         activemq-spring-integration
+         artemis-spring-integration
          ${project.version}
       
       
          org.apache.activemq
-         activemq-vertx-integration
+         artemis-vertx-integration
          ${project.version}
       
       
          org.apache.activemq
-         activemq-journal
+         artemis-journal
          ${project.version}
       
       
          org.apache.activemq
-         activemq-amqp-protocol
+         artemis-amqp-protocol
          ${project.version}
       
       
          org.apache.activemq
-         activemq-stomp-protocol
+         artemis-stomp-protocol
          ${project.version}
       
       
          org.apache.activemq
-         activemq-openwire-protocol
+         artemis-openwire-protocol
          ${project.version}
       
       
          org.apache.activemq
-         activemq-aerogear-integration
+         artemis-aerogear-integration
          ${project.version}
       
       
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/DuplicateDetectionTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/DuplicateDetectionTest.java
index ef54ab5060..1d7530fb4e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/DuplicateDetectionTest.java
@@ -14,32 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration;
+package org.apache.activemq.artemis.tests.integration;
 
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.api.core.ActiveMQDuplicateIdException;
-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.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.message.impl.MessageImpl;
-import org.apache.activemq.core.postoffice.impl.PostOfficeImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.ActiveMQDuplicateIdException;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.message.impl.MessageImpl;
+import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/IntegrationTestLogger.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/IntegrationTestLogger.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/IntegrationTestLogger.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/IntegrationTestLogger.java
index 9b42cba855..023bc9680f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/IntegrationTestLogger.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/IntegrationTestLogger.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration;
+package org.apache.activemq.artemis.tests.integration;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/InterceptorTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/InterceptorTest.java
index f34ff310cf..30f0c7a95b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/InterceptorTest.java
@@ -14,35 +14,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration;
+package org.apache.activemq.artemis.tests.integration;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientConsumerImpl;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.ServerSessionPacketHandler;
-import org.apache.activemq.core.protocol.core.impl.ChannelImpl;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.protocol.core.impl.RemotingConnectionImpl;
-import org.apache.activemq.core.protocol.core.impl.wireformat.CreateQueueMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.MessagePacket;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientConsumerImpl;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.ServerSessionPacketHandler;
+import org.apache.activemq.artemis.core.protocol.core.impl.ChannelImpl;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.protocol.core.impl.RemotingConnectionImpl;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueueMessage;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.MessagePacket;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveMessage;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/SimpleNotificationService.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/SimpleNotificationService.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
index 830ef6f3ee..02458bf7f1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/SimpleNotificationService.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration;
+package org.apache.activemq.artemis.tests.integration;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.core.server.management.Notification;
-import org.apache.activemq.core.server.management.NotificationListener;
-import org.apache.activemq.core.server.management.NotificationService;
+import org.apache.activemq.artemis.core.server.management.Notification;
+import org.apache.activemq.artemis.core.server.management.NotificationListener;
+import org.apache.activemq.artemis.core.server.management.NotificationService;
 
 public class SimpleNotificationService implements NotificationService
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/String64KLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/String64KLimitTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java
index 20151f22be..45847e7220 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/String64KLimitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java
@@ -14,26 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration;
+package org.apache.activemq.artemis.tests.integration;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 
 /**
  *
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/aerogear/AeroGearBasicServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/aerogear/AeroGearBasicServerTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/aerogear/AeroGearBasicServerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/aerogear/AeroGearBasicServerTest.java
index 5e2e2915df..ab37bb873d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/aerogear/AeroGearBasicServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/aerogear/AeroGearBasicServerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.aerogear;
+package org.apache.activemq.artemis.tests.integration.aerogear;
 
 
 import javax.servlet.ServletException;
@@ -25,27 +25,27 @@ import java.util.HashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ConnectorServiceConfiguration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.integration.aerogear.AeroGearConnectorServiceFactory;
-import org.apache.activemq.integration.aerogear.AeroGearConstants;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.json.JSONArray;
-import org.apache.activemq.utils.json.JSONException;
-import org.apache.activemq.utils.json.JSONObject;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.integration.aerogear.AeroGearConnectorServiceFactory;
+import org.apache.activemq.artemis.integration.aerogear.AeroGearConstants;
+import org.apache.activemq.artemis.utils.json.JSONArray;
+import org.apache.activemq.artemis.utils.json.JSONException;
+import org.apache.activemq.artemis.utils.json.JSONObject;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AckBatchSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AckBatchSizeTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AckBatchSizeTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AckBatchSizeTest.java
index eb9e4c25dc..3eac8ed1ce 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AckBatchSizeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AckBatchSizeTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java
index 11611c515c..ef3621fdfc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java
@@ -14,33 +14,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQPropertyConversionException;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.protocol.core.impl.ActiveMQConsumerContext;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.spi.core.remoting.ConsumerContext;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.UUID;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQConsumerContext;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext;
+import org.apache.activemq.artemis.utils.UUID;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ActiveMQCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
similarity index 72%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ActiveMQCrashTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
index 4baf9454cc..e95b5e5bfc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ActiveMQCrashTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
@@ -14,34 +14,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
-import org.apache.activemq.api.core.ActiveMQException;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 
 /**
  *
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AddressSettingsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AddressSettingsTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AddressSettingsTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AddressSettingsTest.java
index 3ed6d17cb9..d85d73cb5c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AddressSettingsTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AddressSettingsTest.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.HierarchicalRepository;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCloseCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCloseCoreTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCloseCoreTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCloseCoreTest.java
index 1fc77388df..4e63021506 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCloseCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCloseCoreTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.tests.util.SingleServerTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.SingleServerTestBase;
 import org.junit.Test;
 
 public class AutoCloseCoreTest extends SingleServerTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCreateJmsQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCreateJmsQueueTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
index d785ceb275..a5bf134f46 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCreateJmsQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import javax.jms.Connection;
 import javax.jms.InvalidDestinationException;
@@ -28,12 +28,12 @@ import javax.jms.TextMessage;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoDeleteJmsQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsQueueTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoDeleteJmsQueueTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsQueueTest.java
index 963cba753b..c6e1ec10d2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoDeleteJmsQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsQueueTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import javax.jms.Connection;
 import javax.jms.Message;
@@ -23,10 +23,10 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.core.server.Queue;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java
index bff38ae98c..f683a0b67e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/BlockingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java
similarity index 79%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/BlockingSendTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java
index 4591fde116..0b624bccae 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/BlockingSendTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java
index 93082d0420..6c0210f1b7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConcurrentCreateDeleteProduceTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
index 694e164fc3..3f2d947ded 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerCloseTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
index ad412f7b90..3fa49e7e9d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
@@ -14,32 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientConsumerImpl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientConsumerImpl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerFilterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerFilterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java
index 6e1d8e1c80..22fc1b236f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerFilterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerRoundRobinTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerRoundRobinTest.java
similarity index 79%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerRoundRobinTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerRoundRobinTest.java
index cc9d0a8c38..62ad8e6d42 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerRoundRobinTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerRoundRobinTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class ConsumerRoundRobinTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerStuckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerStuckTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java
index 3ffaab2bc4..62be9c0ef7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerStuckTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
-import org.apache.activemq.core.protocol.core.impl.RemotingConnectionImpl;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnection;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
+import org.apache.activemq.artemis.core.protocol.core.impl.RemotingConnectionImpl;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
index 201b1902db..40fa4dce41 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,24 +23,24 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQIllegalStateException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.ConcurrentHashSet;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.utils.ConcurrentHashSet;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerWindowSizeTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java
index cb0a1e9f19..0c3a240549 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerWindowSizeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -24,24 +24,24 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientConsumerInternal;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.Bindings;
-import org.apache.activemq.core.postoffice.QueueBinding;
-import org.apache.activemq.core.server.Consumer;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.impl.ServerConsumerImpl;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.Bindings;
+import org.apache.activemq.artemis.core.postoffice.QueueBinding;
+import org.apache.activemq.artemis.core.server.Consumer;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -133,7 +133,7 @@ public class ConsumerWindowSizeTest extends ServiceTestBase
 
       ClientConsumer consumer = consumers.get(2);
       ClientMessage received = consumer.receive(1000);
-      assertNotNull(received);
+      Assert.assertNotNull(received);
 
       for (ClientSession tmpSess : sessions)
       {
@@ -177,14 +177,14 @@ public class ConsumerWindowSizeTest extends ServiceTestBase
          ClientMessage message = null;
          message = consumer.receiveImmediate();
          // message = consumer.receive(1000); // the test will pass if used receive(1000) instead of receiveImmediate
-         assertNotNull(message);
+         Assert.assertNotNull(message);
          message.acknowledge();
 
          prod.send(msg);
          sessionProd.commit();
 
          message = consumer.receive(10000);
-         assertNotNull(message);
+         Assert.assertNotNull(message);
          message.acknowledge();
 
          session.close();
@@ -243,7 +243,7 @@ public class ConsumerWindowSizeTest extends ServiceTestBase
 
       ClientConsumer consumer = consumers.get(2);
       ClientMessage received = consumer.receive(1000);
-      assertNotNull(received);
+      Assert.assertNotNull(received);
 
       for (ClientSession tmpSess : sessions)
       {
@@ -279,7 +279,7 @@ public class ConsumerWindowSizeTest extends ServiceTestBase
          consumers.add(consumer);
          session1.start();
          sessions.add(session1);
-         assertNull(consumer.receive(10));
+         Assert.assertNull(consumer.receive(10));
 
       }
 
@@ -298,7 +298,7 @@ public class ConsumerWindowSizeTest extends ServiceTestBase
 
       ClientConsumer consumer = consumers.get(2);
       ClientMessage received = consumer.receive(5000);
-      assertNotNull(received);
+      Assert.assertNotNull(received);
 
       for (ClientSession tmpSess : sessions)
       {
@@ -394,9 +394,9 @@ public class ConsumerWindowSizeTest extends ServiceTestBase
          t.join();
       }
 
-      assertEquals(0, errors.get());
+      Assert.assertEquals(0, errors.get());
 
-      assertEquals(NUMBER_OF_MESSAGES, received.get());
+      Assert.assertEquals(NUMBER_OF_MESSAGES, received.get());
    }
 
    @Test
@@ -455,7 +455,7 @@ public class ConsumerWindowSizeTest extends ServiceTestBase
 
       }
 
-      assertEquals(NUMBER_OF_MESSAGES, received.get());
+      Assert.assertEquals(NUMBER_OF_MESSAGES, received.get());
    }
 
 
@@ -1085,11 +1085,11 @@ public class ConsumerWindowSizeTest extends ServiceTestBase
             {
                Thread.sleep(10);
             }
-            assertTrue(consumer.getBufferSize() >= 10);
+            Assert.assertTrue(consumer.getBufferSize() >= 10);
 
             ClientMessage msg = consumer.receive(500);
             msg.getBodyBuffer().readByte();
-            assertNotNull(msg);
+            Assert.assertNotNull(msg);
             msg.acknowledge();
             session.rollback();
          }
@@ -1098,7 +1098,7 @@ public class ConsumerWindowSizeTest extends ServiceTestBase
          for (int i = 0; i < numberOfMessages; i++)
          {
             ClientMessage msg = consumer.receive(5000);
-            assertNotNull(msg);
+            Assert.assertNotNull(msg);
             msg.getBodyBuffer().readByte();
             msg.acknowledge();
             session.commit();
@@ -1171,7 +1171,7 @@ public class ConsumerWindowSizeTest extends ServiceTestBase
             int count = 0;
 
             /* (non-Javadoc)
-             * @see org.apache.activemq.api.core.client.MessageHandler#onMessage(org.apache.activemq.api.core.client.ClientMessage)
+             * @see MessageHandler#onMessage(ClientMessage)
              */
             public synchronized void onMessage(final ClientMessage message)
             {
@@ -1331,7 +1331,7 @@ public class ConsumerWindowSizeTest extends ServiceTestBase
             int count = 0;
 
             /* (non-Javadoc)
-             * @see org.apache.activemq.api.core.client.MessageHandler#onMessage(org.apache.activemq.api.core.client.ClientMessage)
+             * @see MessageHandler#onMessage(ClientMessage)
              */
             public synchronized void onMessage(final ClientMessage message)
             {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CoreClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CoreClientTest.java
similarity index 77%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CoreClientTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CoreClientTest.java
index 3db8d82d67..7002e8aa95 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CoreClientTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CoreClientTest.java
@@ -14,28 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
 
 public class CoreClientTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CreateQueueIdempotentTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CreateQueueIdempotentTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java
index 55e2bdbf5e..0e189d61ee 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CreateQueueIdempotentTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQQueueExistsException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeadLetterAddressTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java
index ea32d83b92..2098148f41 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeadLetterAddressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
-import org.apache.activemq.api.core.ActiveMQException;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -27,26 +27,26 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 
 public class DeadLetterAddressTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeliveryOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeliveryOrderTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java
index f4f9adbc7e..a06c0469ba 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeliveryOrderTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DurableQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DurableQueueTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java
index 3a29cbd9f1..343ecd2b5a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DurableQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class DurableQueueTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpireTestOnRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpireTestOnRestartTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
index 4521d538d2..1d8e7eedd2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpireTestOnRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpiryAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryAddressTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpiryAddressTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryAddressTest.java
index 92aebe44b0..62b5383154 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpiryAddressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryAddressTest.java
@@ -14,32 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
-import org.apache.activemq.core.message.impl.MessageImpl;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.message.impl.MessageImpl;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class ExpiryAddressTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpiryLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpiryLargeMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java
index baf93f42b7..2c065ddc39 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ExpiryLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.io.File;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FailureDeadlockTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FailureDeadlockTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
index 8de76957b5..eef85eb5d6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FailureDeadlockTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.jms.server.management.NullInitialContext;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.After;
 
@@ -27,19 +31,16 @@ import javax.jms.ExceptionListener;
 import javax.jms.JMSException;
 import javax.jms.Session;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQSession;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.jms.server.management.NullInitialContext;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQSession;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public class FailureDeadlockTest extends ServiceTestBase
 {
@@ -181,7 +182,7 @@ public class FailureDeadlockTest extends ServiceTestBase
          try
          {
             conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            fail("should throw exception");
+            Assert.fail("should throw exception");
          }
          catch (JMSException e)
          {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
index a0a9397124..3a10791e54 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -33,8 +33,8 @@ import javax.jms.TopicSubscriber;
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 
 public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HangConsumerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
index bc96752994..98b6edc302 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HangConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 import javax.management.MBeanServer;
 import java.lang.management.ManagementFactory;
 import java.util.LinkedList;
@@ -24,48 +24,48 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.core.paging.cursor.PageSubscription;
-import org.apache.activemq.core.persistence.OperationContext;
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.ServerConsumer;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.ServerSessionFactory;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.core.server.impl.QueueFactoryImpl;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.core.server.impl.ServerSessionImpl;
-import org.apache.activemq.core.settings.HierarchicalRepository;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.spi.core.protocol.SessionCallback;
-import org.apache.activemq.spi.core.remoting.ReadyListener;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.ExecutorFactory;
-import org.apache.activemq.utils.ReusableLatch;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
+import org.apache.activemq.artemis.core.persistence.OperationContext;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveMessage;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.ServerConsumer;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.ServerSessionFactory;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.core.server.impl.QueueFactoryImpl;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl;
+import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.spi.core.protocol.SessionCallback;
+import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.utils.ExecutorFactory;
+import org.apache.activemq.artemis.utils.ReusableLatch;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -553,7 +553,7 @@ public class HangConsumerTest extends ServiceTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.spi.core.protocol.SessionCallback#sendProducerCreditsMessage(int, org.apache.activemq.api.core.SimpleString)
+       * @see SessionCallback#sendProducerCreditsMessage(int, SimpleString)
        */
       @Override
       public void sendProducerCreditsMessage(int credits, SimpleString address)
@@ -567,7 +567,7 @@ public class HangConsumerTest extends ServiceTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.spi.core.protocol.SessionCallback#sendMessage(org.apache.activemq.core.server.ServerMessage, long, int)
+       * @see SessionCallback#sendMessage(org.apache.activemq.artemis.core.server.ServerMessage, long, int)
        */
       @Override
       public int sendMessage(ServerMessage message, ServerConsumer consumer, int deliveryCount)
@@ -595,7 +595,7 @@ public class HangConsumerTest extends ServiceTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.spi.core.protocol.SessionCallback#sendLargeMessage(org.apache.activemq.core.server.ServerMessage, long, long, int)
+       * @see SessionCallback#sendLargeMessage(org.apache.activemq.artemis.core.server.ServerMessage, long, long, int)
        */
       @Override
       public int sendLargeMessage(ServerMessage message, ServerConsumer consumer, long bodySize, int deliveryCount)
@@ -604,7 +604,7 @@ public class HangConsumerTest extends ServiceTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.spi.core.protocol.SessionCallback#sendLargeMessageContinuation(long, byte[], boolean, boolean)
+       * @see SessionCallback#sendLargeMessageContinuation(long, byte[], boolean, boolean)
        */
       @Override
       public int sendLargeMessageContinuation(ServerConsumer consumer, byte[] body, boolean continues, boolean requiresResponse)
@@ -613,7 +613,7 @@ public class HangConsumerTest extends ServiceTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.spi.core.protocol.SessionCallback#closed()
+       * @see SessionCallback#closed()
        */
       @Override
       public void closed()
@@ -622,7 +622,7 @@ public class HangConsumerTest extends ServiceTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.spi.core.protocol.SessionCallback#addReadyListener(org.apache.activemq.spi.core.remoting.ReadyListener)
+       * @see SessionCallback#addReadyListener(ReadyListener)
        */
       @Override
       public void addReadyListener(ReadyListener listener)
@@ -631,7 +631,7 @@ public class HangConsumerTest extends ServiceTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.spi.core.protocol.SessionCallback#removeReadyListener(org.apache.activemq.spi.core.remoting.ReadyListener)
+       * @see SessionCallback#removeReadyListener(ReadyListener)
        */
       @Override
       public void removeReadyListener(ReadyListener listener)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HeuristicXATest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HeuristicXATest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java
index bcc103f4ad..30095d3b92 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HeuristicXATest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java
@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -29,21 +31,19 @@ import javax.transaction.xa.Xid;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.ActiveMQServerControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
 
 public class HeuristicXATest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InVMNonPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InVMNonPersistentMessageBufferTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InVMNonPersistentMessageBufferTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InVMNonPersistentMessageBufferTest.java
index 3dbe79af0f..48c5a82f43 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InVMNonPersistentMessageBufferTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InVMNonPersistentMessageBufferTest.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -22,17 +23,16 @@ import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.DataConstants;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.DataConstants;
 
 public class InVMNonPersistentMessageBufferTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InVMPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InVMPersistentMessageBufferTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InVMPersistentMessageBufferTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InVMPersistentMessageBufferTest.java
index 0cc8921af8..177c2c7ffd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InVMPersistentMessageBufferTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InVMPersistentMessageBufferTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 public class InVMPersistentMessageBufferTest extends InVMNonPersistentMessageBufferTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/IncompatibleVersionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
similarity index 80%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/IncompatibleVersionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
index 6277051399..a955ae7a18 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/IncompatibleVersionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
@@ -14,40 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQIncompatibleClientServerException;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.protocol.core.Channel;
-import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage;
-import org.apache.activemq.core.remoting.server.impl.RemotingServiceImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.version.impl.VersionImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.SpawnedVMSupport;
-import org.apache.activemq.utils.VersionLoader;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQIncompatibleClientServerException;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.protocol.core.Channel;
+import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSessionMessage;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSessionResponseMessage;
+import org.apache.activemq.artemis.core.remoting.server.impl.RemotingServiceImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.version.impl.VersionImpl;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.utils.VersionLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.apache.activemq.tests.util.RandomUtil.randomString;
+import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString;
 
 public class IncompatibleVersionTest extends ServiceTestBase
 {
@@ -214,13 +214,13 @@ public class IncompatibleVersionTest extends ServiceTestBase
       boolean result = false;
       try
       {
-         serverProcess = SpawnedVMSupport.spawnVM("org.apache.activemq.tests.integration.client.IncompatibleVersionTest",
-                                                  new String[]{"-D" + VersionLoader.VERSION_PROP_FILE_KEY + "=" + propFileName},
-                                                  "server",
-                                                  serverStartedString);
+         serverProcess = SpawnedVMSupport.spawnVM("org.apache.activemq.artemis.tests.integration.client.IncompatibleVersionTest",
+                 new String[]{"-D" + VersionLoader.VERSION_PROP_FILE_KEY + "=" + propFileName},
+                 "server",
+                 serverStartedString);
          Thread.sleep(2000);
 
-         Process client = SpawnedVMSupport.spawnVM("org.apache.activemq.tests.integration.client.IncompatibleVersionTest",
+         Process client = SpawnedVMSupport.spawnVM("org.apache.activemq.artemis.tests.integration.client.IncompatibleVersionTest",
                                                    new String[]{"-D" + VersionLoader.VERSION_PROP_FILE_KEY + "=" + propFileName},
                                                    "client");
 
@@ -253,7 +253,7 @@ public class IncompatibleVersionTest extends ServiceTestBase
       {
          Configuration conf = new ConfigurationImpl()
             .setSecurityEnabled(false)
-            .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory"));
+            .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory"));
          ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false);
          server.start();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InterruptedLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InterruptedLargeMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
index ee1cabc248..4e3d51923e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InterruptedLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
@@ -25,37 +25,39 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.paging.cursor.PageSubscription;
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionContinuationMessage;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.MessageReference;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.QueueFactory;
-import org.apache.activemq.core.server.ServerSession;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.core.server.impl.ServerSessionImpl;
-import org.apache.activemq.core.settings.HierarchicalRepository;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.largemessage.LargeMessageTestBase;
-import org.apache.activemq.utils.ExecutorFactory;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.largemessage.LargeMessageTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionContinuationMessage;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.QueueFactory;
+import org.apache.activemq.artemis.core.server.ServerSession;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl;
+import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.utils.ExecutorFactory;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -126,7 +128,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase
 
       server.stop(false);
 
-      forceGC();
+      UnitTestCase.forceGC();
 
       server.start();
 
@@ -204,8 +206,8 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase
 
       t.join();
 
-      assertEquals(0, unexpectedErrors.get());
-      assertEquals(1, expectedErrors.get());
+      Assert.assertEquals(0, unexpectedErrors.get());
+      Assert.assertEquals(1, expectedErrors.get());
 
       session.close();
 
@@ -256,10 +258,10 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase
          for (int i = 0; i < 10; i++)
          {
             ClientMessage clientMessage = cons.receive(5000);
-            assertNotNull(clientMessage);
+            Assert.assertNotNull(clientMessage);
             for (int countByte = 0; countByte < LARGE_MESSAGE_SIZE; countByte++)
             {
-               assertEquals(getSamplebyte(countByte), clientMessage.getBodyBuffer().readByte());
+               Assert.assertEquals(UnitTestCase.getSamplebyte(countByte), clientMessage.getBodyBuffer().readByte());
             }
             clientMessage.acknowledge();
          }
@@ -335,10 +337,10 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase
          for (int i = 0; i < 10; i++)
          {
             ClientMessage clientMessage = cons.receive(5000);
-            assertNotNull(clientMessage);
+            Assert.assertNotNull(clientMessage);
             for (int countByte = 0; countByte < LARGE_MESSAGE_SIZE; countByte++)
             {
-               assertEquals(getSamplebyte(countByte), clientMessage.getBodyBuffer().readByte());
+               Assert.assertEquals(UnitTestCase.getSamplebyte(countByte), clientMessage.getBodyBuffer().readByte());
             }
             clientMessage.acknowledge();
          }
@@ -445,8 +447,8 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase
          {
             log.info("I = " + i);
             ClientMessage msg = cons1.receive(5000);
-            assertNotNull(msg);
-            assertEquals(1, msg.getIntProperty("txid").intValue());
+            Assert.assertNotNull(msg);
+            Assert.assertEquals(1, msg.getIntProperty("txid").intValue());
             msg.acknowledge();
          }
 
@@ -585,7 +587,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase
          }
 
          /* (non-Javadoc)
-          * @see org.apache.activemq.core.server.QueueFactory#setPostOffice(org.apache.activemq.core.postoffice.PostOffice)
+          * @see org.apache.activemq.artemis.core.server.QueueFactory#setPostOffice(org.apache.activemq.artemis.core.postoffice.PostOffice)
           */
          public void setPostOffice(PostOffice postOffice)
          {
@@ -639,7 +641,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase
       for (int i = 0; i < 10; i++)
       {
          ClientMessage msg = cons.receive(5000);
-         assertNotNull(msg);
+         Assert.assertNotNull(msg);
          msg.saveToOutputStream(new java.io.OutputStream()
          {
             @Override
@@ -708,7 +710,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase
       for (int i = 0; i < 10; i++)
       {
          ClientMessage msg = cons.receive(5000);
-         assertNotNull(msg);
+         Assert.assertNotNull(msg);
          msg.saveToOutputStream(new java.io.OutputStream()
          {
             @Override
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JMSMessageCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JMSMessageCounterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java
index de4d1a4fbc..b1b92a8f88 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JMSMessageCounterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -23,9 +23,9 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.api.jms.management.JMSQueueControl;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Test;
 
 public class JMSMessageCounterTest extends JMSTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JMSPagingFileDeleteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JMSPagingFileDeleteTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java
index d1dc15bfd6..5bd5268714 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JMSPagingFileDeleteTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -24,11 +24,11 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.Topic;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.paging.PagingStore;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.core.paging.PagingStore;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JmsNettyNioStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JmsNettyNioStressTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
index a982aec663..ac20c5bdcc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JmsNettyNioStressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -26,19 +26,19 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java
index fb482a4722..95cc3e498f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -204,13 +204,13 @@ public class JournalCrashTest extends ServiceTestBase
    {
       System.err.println("running external process...");
       Process process = SpawnedVMSupport.spawnVM(this.getClass().getCanonicalName(),
-                                                 "-Xms128m", "-Xmx128m",
-                                                 new String[]{},
-                                                 true,
-                                                 true,
-                                                 tempDir,
-                                                 Integer.toString(start),
-                                                 Integer.toString(end));
+              "-Xms128m", "-Xmx128m",
+              new String[]{},
+              true,
+              true,
+              tempDir,
+              Integer.toString(start),
+              Integer.toString(end));
 
       Assert.assertEquals(100, process.waitFor());
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java
index 280b1a998d..bed8582749 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -94,7 +94,7 @@ public class LargeMessageAvoidLargeMessagesTest extends LargeMessageTest
       for (int i = 0; i < input.getSize(); i++)
       {
          byte b = msg1.getBodyBuffer().readByte();
-         assertEquals("incorrect char ", input.getChar(i), b);
+         Assert.assertEquals("incorrect char ", input.getChar(i), b);
       }
       msg1.acknowledge();
       consumer.close();
@@ -147,7 +147,7 @@ public class LargeMessageAvoidLargeMessagesTest extends LargeMessageTest
          for (int i = 0; i < input.getSize(); i++)
          {
             byte b = msg1.getBodyBuffer().readByte();
-            assertEquals("incorrect char ", input.getChar(i), b);
+            Assert.assertEquals("incorrect char ", input.getChar(i), b);
          }
          msg1.acknowledge();
       }
@@ -205,7 +205,7 @@ public class LargeMessageAvoidLargeMessagesTest extends LargeMessageTest
          for (int i = 0; i < input.getSize(); i++)
          {
             byte b = msg1.getBodyBuffer().readByte();
-            assertEquals("incorrect char", input.getChar(i), b);
+            Assert.assertEquals("incorrect char", input.getChar(i), b);
          }
          msg1.acknowledge();
       }
@@ -272,7 +272,7 @@ public class LargeMessageAvoidLargeMessagesTest extends LargeMessageTest
             for (int i = 0; i < regularInput.getSize(); i++)
             {
                byte b = msg1.getBodyBuffer().readByte();
-               assertEquals("incorrect char ", regularInput.getChar(i), b);
+               Assert.assertEquals("incorrect char ", regularInput.getChar(i), b);
             }
          }
          else
@@ -280,7 +280,7 @@ public class LargeMessageAvoidLargeMessagesTest extends LargeMessageTest
             for (int i = 0; i < largeInput.getSize(); i++)
             {
                byte b = msg1.getBodyBuffer().readByte();
-               assertEquals("incorrect char ", largeInput.getChar(i), b);
+               Assert.assertEquals("incorrect char ", largeInput.getChar(i), b);
             }
          }
          msg1.acknowledge();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageCompressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageCompressTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java
index 2d514b3030..7ef09ba84a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageCompressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,16 +24,16 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
index 131ddbb1c8..657de07e57 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
@@ -26,30 +26,30 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientConsumerInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.message.impl.MessageImpl;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.persistence.impl.journal.LargeServerMessageImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.largemessage.LargeMessageTestBase;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.largemessage.LargeMessageTestBase;
+import org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.message.impl.MessageImpl;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LibaioDependencyCheckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LibaioDependencyCheckTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java
index 264097c1c7..f5dcd1bd91 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LibaioDependencyCheckTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import org.junit.Test;
 
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 
 /**
  * This tests is placed in duplication here to validate that the libaio module is properly loaded on this
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConcurrencyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConcurrencyTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java
index 9c0dc31550..8203ad93d6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConcurrencyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConsumerRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConsumerRollbackTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
index f795dae311..b90540a73c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConsumerRollbackTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.HashSet;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageCounterTest.java
similarity index 79%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageCounterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageCounterTest.java
index 0b37b47acb..5ae4760593 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageCounterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageCounterTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class MessageCounterTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
index 18ba111940..42bc4b86aa 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQNonExistentQueueException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageExpirationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageExpirationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
index debc05c0e7..beca5e6af6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageExpirationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
@@ -14,26 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class MessageExpirationTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java
index 4b469f8ba6..23a28f8df3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
-import org.apache.activemq.api.core.ActiveMQException;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -26,21 +27,20 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class MessageGroupingConnectionFactoryTest extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java
index a01498b394..2097ba8346 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java
@@ -14,8 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
-import org.apache.activemq.api.core.ActiveMQException;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Assume;
 import org.junit.Before;
 
@@ -30,23 +32,21 @@ import javax.transaction.xa.Xid;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
 
 public class MessageGroupingTest extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageHandlerTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageHandlerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageHandlerTest.java
index 680c71b1b8..e2cd355492 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageHandlerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageHandlerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -24,17 +24,17 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class MessageHandlerTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessagePriorityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessagePriorityTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
index c0288b523c..e0f7d8cde4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessagePriorityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageRateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageRateTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
index 6c0213810f..141836e7f8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageRateTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
index b45c46b6c3..7a261a1e58 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
@@ -14,24 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 
 /**
  * Multiple Threads producing Messages, with Multiple Consumers with different queues, each queue with a different filter
@@ -107,7 +108,7 @@ public class MultipleThreadFilterOneTest extends ServiceTestBase
       }
 
       /**
-       * @throws org.apache.activemq.api.core.ActiveMQException
+       * @throws ActiveMQException
        */
       private void sendMessages(int msgs) throws ActiveMQException
       {
@@ -164,8 +165,8 @@ public class MultipleThreadFilterOneTest extends ServiceTestBase
             for (int i = 0; i < numberOfMessages; i++)
             {
                ClientMessage msg = consumer.receive(5000);
-               assertNotNull(msg);
-               assertEquals(nr, msg.getIntProperty("prodNR").intValue());
+               Assert.assertNotNull(msg);
+               Assert.assertEquals(nr, msg.getIntProperty("prodNR").intValue());
                msg.acknowledge();
 
                if (i % 500 == 0)
@@ -175,7 +176,7 @@ public class MultipleThreadFilterOneTest extends ServiceTestBase
                }
             }
 
-            assertNull(consumer.receiveImmediate());
+            Assert.assertNull(consumer.receiveImmediate());
 
             consumerSession.commit();
          }
@@ -287,13 +288,13 @@ public class MultipleThreadFilterOneTest extends ServiceTestBase
          for (SomeProducer producer : producers)
          {
             producer.join();
-            assertEquals(0, producer.errors.get());
+            Assert.assertEquals(0, producer.errors.get());
          }
 
          for (SomeConsumer consumer : consumers)
          {
             consumer.join();
-            assertEquals(0, consumer.errors.get());
+            Assert.assertEquals(0, consumer.errors.get());
          }
 
          if (useDeadConsumer)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NIOvsOIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NIOvsOIOTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
index c893d41bc7..7f9d9c16ee 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NIOvsOIOTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
@@ -14,8 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -24,25 +26,23 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.HierarchicalRepository;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 public class NIOvsOIOTest extends UnitTestCase
 {
@@ -155,7 +155,7 @@ public class NIOvsOIOTest extends UnitTestCase
 
    private void testPerf(boolean nio) throws Exception
    {
-      String acceptorFactoryClassName = "org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory";
+      String acceptorFactoryClassName = "org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory";
 
       Configuration conf = createDefaultConfig()
          .setSecurityEnabled(false);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConnectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java
similarity index 75%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConnectorTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java
index 3d370ab716..4d018a9bfc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConnectorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import io.netty.bootstrap.Bootstrap;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnector;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConsumerWindowSizeTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConsumerWindowSizeTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConsumerWindowSizeTest.java
index c4ce17cea2..baac554832 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConsumerWindowSizeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConsumerWindowSizeTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 public class NettyConsumerWindowSizeTest extends ConsumerWindowSizeTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyNonPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyNonPersistentMessageBufferTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyNonPersistentMessageBufferTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyNonPersistentMessageBufferTest.java
index 2cfbd69601..176bc45efc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyNonPersistentMessageBufferTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyNonPersistentMessageBufferTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 public class NettyNonPersistentMessageBufferTest extends InVMNonPersistentMessageBufferTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyPersistentMessageBufferTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyPersistentMessageBufferTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyPersistentMessageBufferTest.java
index 618e9004f2..3c8a1bff93 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyPersistentMessageBufferTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyPersistentMessageBufferTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 public class NettyPersistentMessageBufferTest extends InVMNonPersistentMessageBufferTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyProducerFlowControlTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyProducerFlowControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyProducerFlowControlTest.java
index 4485663adc..0d00733fb8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyProducerFlowControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyProducerFlowControlTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 public class NettyProducerFlowControlTest extends ProducerFlowControlTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NewDeadLetterAddressTest.java
similarity index 75%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NewDeadLetterAddressTest.java
index 90303b2aef..adfd621df9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NewDeadLetterAddressTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
-import org.apache.activemq.api.core.ActiveMQException;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -23,20 +24,19 @@ import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 
 /**
  *
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/OrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/OrderTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java
index 7ed7c301ba..8088189af9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/OrderTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingOrderTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingOrderTest.java
index e44b40e2c7..94a860bf42 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingOrderTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -27,32 +27,32 @@ import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.paging.PagingStore;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.Bindings;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.paging.PagingStore;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.Bindings;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingSyncTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingSyncTest.java
index 6f14832f0d..500a0847d1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingSyncTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java
index f62bb98ceb..d74a94ff9f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
@@ -33,49 +33,49 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.Pair;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientConsumerInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.DivertConfiguration;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.journal.IOAsyncTask;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.core.paging.PagedMessage;
-import org.apache.activemq.core.paging.PagingManager;
-import org.apache.activemq.core.paging.PagingStore;
-import org.apache.activemq.core.paging.cursor.PageCursorProvider;
-import org.apache.activemq.core.paging.cursor.impl.PagePositionImpl;
-import org.apache.activemq.core.paging.impl.Page;
-import org.apache.activemq.core.persistence.OperationContext;
-import org.apache.activemq.core.persistence.impl.journal.DescribeJournal;
-import org.apache.activemq.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe;
-import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.AckDescribe;
-import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.logs.AssertionLoggerHandler;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.Pair;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.DivertConfiguration;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.journal.IOAsyncTask;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.paging.PagedMessage;
+import org.apache.activemq.artemis.core.paging.PagingManager;
+import org.apache.activemq.artemis.core.paging.PagingStore;
+import org.apache.activemq.artemis.core.paging.cursor.PageCursorProvider;
+import org.apache.activemq.artemis.core.paging.cursor.impl.PagePositionImpl;
+import org.apache.activemq.artemis.core.paging.impl.Page;
+import org.apache.activemq.artemis.core.persistence.OperationContext;
+import org.apache.activemq.artemis.core.persistence.impl.journal.DescribeJournal;
+import org.apache.activemq.artemis.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.AckDescribe;
+import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
similarity index 71%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
index 7f604a24a2..5a9f5f5961 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
@@ -14,26 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class ProducerCloseTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java
index 48edaff2d8..1f053c99b5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -23,27 +23,27 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.activemq.api.core.ActiveMQObjectClosedException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientProducerCreditManagerImpl;
-import org.apache.activemq.core.client.impl.ClientProducerCredits;
-import org.apache.activemq.core.client.impl.ClientProducerInternal;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.HierarchicalRepository;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientProducerCreditManagerImpl;
+import org.apache.activemq.artemis.core.client.impl.ClientProducerCredits;
+import org.apache.activemq.artemis.core.client.impl.ClientProducerInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java
similarity index 80%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java
index e7598e0661..039c961682 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/QueueBrowserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/QueueBrowserTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/QueueBrowserTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/QueueBrowserTest.java
index f85af15344..c8170a1b82 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/QueueBrowserTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/QueueBrowserTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
 
 public class QueueBrowserTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveImmediateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveImmediateTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveImmediateTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveImmediateTest.java
index 62760dd9d6..145f6bfca0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveImmediateTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveImmediateTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -23,18 +23,18 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class ReceiveImmediateTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java
index c8ac7f11d1..487fde1d01 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQIllegalStateException;
-import org.apache.activemq.api.core.ActiveMQObjectClosedException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
+import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -106,7 +106,7 @@ public class ReceiveTest extends ServiceTestBase
       }
       catch (ActiveMQException e)
       {
-         fail("Invalid Exception type:" + e.getType());
+         Assert.fail("Invalid Exception type:" + e.getType());
       }
       session.close();
    }
@@ -137,7 +137,7 @@ public class ReceiveTest extends ServiceTestBase
       }
       catch (ActiveMQException e)
       {
-         fail("Invalid Exception type:" + e.getType());
+         Assert.fail("Invalid Exception type:" + e.getType());
       }
       session.close();
    }
@@ -164,7 +164,7 @@ public class ReceiveTest extends ServiceTestBase
       Assert.assertNotNull(cc.receive(5000));
       if (cc.receiveImmediate() == null)
       {
-         assertNotNull(cc2.receiveImmediate());
+         Assert.assertNotNull(cc2.receiveImmediate());
       }
       session.close();
       sendSession.close();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
index 0ecc5c5bc3..85031fbeaf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
@@ -14,29 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.journal.LoaderCallback;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.journal.LoaderCallback;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RequestorTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RequestorTest.java
index 9e1726bba3..892b58547e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RequestorTest.java
@@ -14,28 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientRequestor;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientMessageImpl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientRequestor;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -215,8 +215,8 @@ public class RequestorTest extends ServiceTestBase
       };
 
       UnitTestCase.expectActiveMQException("ClientRequestor's session must not be closed",
-                                           ActiveMQExceptionType.OBJECT_CLOSED,
-                                           activeMQAction);
+              ActiveMQExceptionType.OBJECT_CLOSED,
+              activeMQAction);
    }
 
    @Test
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RoutingTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RoutingTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RoutingTest.java
index 9db4621b35..f160d71730 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RoutingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RoutingTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java
similarity index 80%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java
index d2a6009133..0ce600d807 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java
index d5aa7f4d9c..2fb373f990 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseOnGCTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
index bc2178f424..372a8fd8fb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseOnGCTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.lang.ref.WeakReference;
 
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
index 76ec5ce4c6..397556d48b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -27,20 +28,19 @@ import javax.transaction.xa.XAResource;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class SessionCloseTest extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java
similarity index 74%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java
index 78438a33fa..3650e318f8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.ActiveMQObjectClosedException;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateAndDeleteQueueTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateAndDeleteQueueTest.java
index 982a88d3e4..19f4d80948 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateAndDeleteQueueTest.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQNonExistentQueueException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.impl.LastValueQueue;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.impl.LastValueQueue;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateConsumerTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateConsumerTest.java
index 08753c93aa..aa87a70f18 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateConsumerTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQInvalidFilterExpressionException;
-import org.apache.activemq.api.core.ActiveMQNonExistentQueueException;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQInvalidFilterExpressionException;
+import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateProducerTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateProducerTest.java
index 573f07f91e..714bd247d6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateProducerTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQObjectClosedException;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionFactoryTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionFactoryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionFactoryTest.java
index d3bd8ab095..b28a558c71 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionFactoryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionFactoryTest.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.activemq.api.core.BroadcastGroupConfiguration;
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
index 954deb6120..690c51c1be 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionStopStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionStopStartTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java
index 105996e161..b68d0db865 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionStopStartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -24,17 +24,17 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class SessionStopStartTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
index 786b961858..46fa21b05d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
@@ -14,29 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQInternalErrorException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSession.QueueQuery;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.client.SessionFailureListener;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.CountDownSessionFailureListener;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSession.QueueQuery;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
+import org.apache.activemq.artemis.tests.util.CountDownSessionFailureListener;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SimpleSendMultipleQueuesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SimpleSendMultipleQueuesTest.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SimpleSendMultipleQueuesTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SimpleSendMultipleQueuesTest.java
index 0562278fea..1ac46ecf1f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SimpleSendMultipleQueuesTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SimpleSendMultipleQueuesTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 import org.junit.Before;
 import org.junit.After;
 
@@ -22,15 +22,15 @@ import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class SimpleSendMultipleQueuesTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
index 32edb5faec..249c269231 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -22,25 +22,25 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQObjectClosedException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.CoreNotificationType;
-import org.apache.activemq.api.core.management.ManagementHelper;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.core.settings.impl.SlowConsumerPolicy;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.CoreNotificationType;
+import org.apache.activemq.artemis.api.core.management.ManagementHelper;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
index 117989810d..f1f75b6ed0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
@@ -14,46 +14,45 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQDisconnectedException;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQIOErrorException;
-import org.apache.activemq.api.core.ActiveMQInternalErrorException;
-import org.apache.activemq.api.core.ActiveMQNonExistentQueueException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientProducerImpl;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.protocol.core.impl.RemotingConnectionImpl;
-import org.apache.activemq.core.remoting.CloseListener;
-import org.apache.activemq.core.remoting.server.impl.RemotingServiceImpl;
-import org.apache.activemq.core.server.ServerSession;
-import org.apache.activemq.core.server.impl.ServerSessionImpl;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.SingleServerTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQDisconnectedException;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQIOErrorException;
+import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException;
+import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.SingleServerTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientProducerImpl;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.protocol.core.impl.RemotingConnectionImpl;
+import org.apache.activemq.artemis.core.remoting.CloseListener;
+import org.apache.activemq.artemis.core.remoting.server.impl.RemotingServiceImpl;
+import org.apache.activemq.artemis.core.server.ServerSession;
+import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class TemporaryQueueTest extends SingleServerTestBase
@@ -88,7 +87,7 @@ public class TemporaryQueueTest extends SingleServerTestBase
       session.start();
       ClientConsumer consumer = session.createConsumer(queue);
       ClientMessage message = consumer.receive(500);
-      Assert.assertNotNull(message);
+      assertNotNull(message);
       message.acknowledge();
 
       consumer.close();
@@ -137,7 +136,7 @@ public class TemporaryQueueTest extends SingleServerTestBase
       session.start();
       ClientConsumer consumer = session.createConsumer(queue);
       ClientMessage message = consumer.receive(500);
-      Assert.assertNotNull(message);
+      assertNotNull(message);
       message.acknowledge();
 
       SimpleString[] storeNames = server.getPagingManager().getStoreNames();
@@ -168,7 +167,7 @@ public class TemporaryQueueTest extends SingleServerTestBase
 
       ClientConsumer consumer = session2.createConsumer(queue);
       ClientMessage message = consumer.receive(500);
-      Assert.assertNotNull(message);
+      assertNotNull(message);
 
       session2.close();
       session.close();
@@ -205,7 +204,7 @@ public class TemporaryQueueTest extends SingleServerTestBase
       session.close();
       sf.close();
       // wait for the closing listeners to be fired
-      Assert.assertTrue("connection close listeners not fired", latch.await(2 * TemporaryQueueTest.CONNECTION_TTL,
+      assertTrue("connection close listeners not fired", latch.await(2 * TemporaryQueueTest.CONNECTION_TTL,
                                                                             TimeUnit.MILLISECONDS));
 
       sf = addSessionFactory(createSessionFactory(locator));
@@ -215,7 +214,7 @@ public class TemporaryQueueTest extends SingleServerTestBase
       try
       {
          session.createConsumer(queue);
-         Assert.fail("temp queue must not exist after the remoting connection is closed");
+         fail("temp queue must not exist after the remoting connection is closed");
       }
       catch (ActiveMQNonExistentQueueException neqe)
       {
@@ -328,7 +327,7 @@ public class TemporaryQueueTest extends SingleServerTestBase
       SimpleString address = RandomUtil.randomSimpleString();
 
       session.createTemporaryQueue(address, queue);
-      Assert.assertEquals(1, server.getConnectionCount());
+      assertEquals(1, server.getConnectionCount());
 
       // we create a second session. the temp queue must be present
       // even after we closed the session which created it
@@ -527,10 +526,10 @@ public class TemporaryQueueTest extends SingleServerTestBase
       session = sf.createSession(false, true, true);
 
       session.createTemporaryQueue(address, queue);
-      Assert.assertTrue("server has not received any ping from the client",
+      assertTrue("server has not received any ping from the client",
                         pingOnServerLatch.await(2 * RemotingServiceImpl.CONNECTION_TTL_CHECK_INTERVAL,
                                                 TimeUnit.MILLISECONDS));
-      Assert.assertEquals(1, server.getConnectionCount());
+      assertEquals(1, server.getConnectionCount());
 
       RemotingConnection remotingConnection = server.getRemotingService().getConnections().iterator().next();
       final CountDownLatch serverCloseLatch = new CountDownLatch(1);
@@ -545,7 +544,7 @@ public class TemporaryQueueTest extends SingleServerTestBase
       ((ClientSessionInternal) session).getConnection().fail(new ActiveMQInternalErrorException("simulate a client failure"));
 
       // let some time for the server to clean the connections
-      Assert.assertTrue("server has not closed the connection",
+      assertTrue("server has not closed the connection",
                         serverCloseLatch.await(2 * RemotingServiceImpl.CONNECTION_TTL_CHECK_INTERVAL +
                                                   2 *
                                                      TemporaryQueueTest.CONNECTION_TTL, TimeUnit.MILLISECONDS));
@@ -556,7 +555,7 @@ public class TemporaryQueueTest extends SingleServerTestBase
          Thread.sleep(1);
       }
 
-      Assert.assertEquals(0, server.getConnectionCount());
+      assertEquals(0, server.getConnectionCount());
 
       session.close();
 
@@ -576,7 +575,7 @@ public class TemporaryQueueTest extends SingleServerTestBase
       };
 
       UnitTestCase.expectActiveMQException("temp queue must not exist after the server detected the client crash",
-                                           ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, activeMQAction);
+              ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, activeMQAction);
 
       session.close();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionDurabilityTest.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionDurabilityTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionDurabilityTest.java
index cc5340c9b2..459152e9e2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionDurabilityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionDurabilityTest.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class TransactionDurabilityTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionalSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionalSendTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionalSendTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionalSendTest.java
index 1d9c378e73..d5cc9534d6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionalSendTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionalSendTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransientQueueTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransientQueueTest.java
index bace13bc80..342b5e7a16 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransientQueueTest.java
@@ -14,19 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
+package org.apache.activemq.artemis.tests.integration.client;
 
-import org.apache.activemq.api.core.ActiveMQInvalidTransientQueueUseException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.SingleServerTestBase;
-import org.junit.Assert;
+import org.apache.activemq.artemis.api.core.ActiveMQInvalidTransientQueueUseException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.SingleServerTestBase;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.Test;
 
 public class TransientQueueTest extends SingleServerTestBase
@@ -39,7 +38,7 @@ public class TransientQueueTest extends SingleServerTestBase
       SimpleString address = RandomUtil.randomSimpleString();
 
       session.createSharedQueue(address, queue, false);
-      Assert.assertEquals(1, server.getConnectionCount());
+      assertEquals(1, server.getConnectionCount());
 
       // we create a second session. the temp queue must be present
       // even after we closed the session which created it
@@ -61,7 +60,7 @@ public class TransientQueueTest extends SingleServerTestBase
       SimpleString address = SimpleString.toSimpleString("address");
 
       session.createSharedQueue(address, queue, false);
-      Assert.assertEquals(1, server.getConnectionCount());
+      assertEquals(1, server.getConnectionCount());
 
       assertNotNull(server.locateQueue(queue));
 
@@ -153,7 +152,7 @@ public class TransientQueueTest extends SingleServerTestBase
       SimpleString address2 = RandomUtil.randomSimpleString();
 
       session.createSharedQueue(address, queue, false);
-      Assert.assertEquals(1, server.getConnectionCount());
+      assertEquals(1, server.getConnectionCount());
 
 
       ServerLocator locator2 = createLocator();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java
index 0b5628abee..17383c0df4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.client;
-import org.apache.activemq.api.core.ActiveMQException;
+package org.apache.activemq.artemis.tests.integration.client;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -23,19 +24,18 @@ import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
 
 public class WildCardRoutingTest extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientCrashTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
index 5f5bf522e4..dcfb673ad9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientCrashTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
@@ -14,25 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.clientcrash;
+package org.apache.activemq.artemis.tests.integration.clientcrash;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
 import org.junit.Before;
 
 import org.junit.Test;
 
-import org.junit.Assert;
-
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
 
 /**
  * A test that makes sure that a ActiveMQ server cleans up the associated
@@ -90,8 +88,8 @@ public class ClientCrashTest extends ClientTestBase
 
       // receive a message from the queue
       Message messageFromClient = consumer.receive(5000);
-      Assert.assertNotNull("no message received", messageFromClient);
-      Assert.assertEquals(ClientCrashTest.MESSAGE_TEXT_FROM_CLIENT, messageFromClient.getBodyBuffer().readString());
+      assertNotNull("no message received", messageFromClient);
+      assertEquals(ClientCrashTest.MESSAGE_TEXT_FROM_CLIENT, messageFromClient.getBodyBuffer().readString());
 
       assertActiveConnections(1 + 1); // One local and one from the other vm
       assertActiveSession(1 + 1);
@@ -107,7 +105,7 @@ public class ClientCrashTest extends ClientTestBase
       ClientCrashTest.log.debug("waiting for the client VM to crash ...");
       p.waitFor();
 
-      Assert.assertEquals(9, p.exitValue());
+      assertEquals(9, p.exitValue());
 
       System.out.println("VM Exited");
 
@@ -143,7 +141,7 @@ public class ClientCrashTest extends ClientTestBase
       ClientCrashTest.log.debug("waiting for the client VM to crash ...");
       p.waitFor();
 
-      Assert.assertEquals(9, p.exitValue());
+      assertEquals(9, p.exitValue());
 
       System.out.println("VM Exited");
 
@@ -158,8 +156,8 @@ public class ClientCrashTest extends ClientTestBase
 
       // receive a message from the queue
       ClientMessage messageFromClient = consumer.receive(timeout);
-      Assert.assertNotNull("no message received", messageFromClient);
-      Assert.assertEquals(ClientCrashTest.MESSAGE_TEXT_FROM_CLIENT, messageFromClient.getBodyBuffer().readString());
+      assertNotNull("no message received", messageFromClient);
+      assertEquals(ClientCrashTest.MESSAGE_TEXT_FROM_CLIENT, messageFromClient.getBodyBuffer().readString());
 
       assertEquals("delivery count", 2, messageFromClient.getDeliveryCount());
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientExitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
similarity index 78%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientExitTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
index 9d0ffc8304..346f36b7af 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientExitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
@@ -14,25 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.clientcrash;
+package org.apache.activemq.artemis.tests.integration.clientcrash;
 import org.junit.Before;
 
 import org.junit.Test;
 
-import org.junit.Assert;
-
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
 
 /**
  * A test that makes sure that a ActiveMQ client gracefully exists after the last session is
@@ -75,15 +73,15 @@ public class ClientExitTest extends ClientTestBase
 
       Message message = consumer.receive(15000);
 
-      Assert.assertNotNull(message);
-      Assert.assertEquals(ClientExitTest.MESSAGE_TEXT, message.getBodyBuffer().readString());
+      assertNotNull(message);
+      assertEquals(ClientExitTest.MESSAGE_TEXT, message.getBodyBuffer().readString());
 
       // the client VM should exit by itself. If it doesn't, that means we have a problem
       // and the test will timeout
       ClientExitTest.log.debug("waiting for the client VM to exit ...");
       p.waitFor();
 
-      Assert.assertEquals(0, p.exitValue());
+      assertEquals(0, p.exitValue());
 
       // FIXME https://jira.jboss.org/jira/browse/JBMESSAGING-1421
       // Thread.sleep(1000);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientTestBase.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientTestBase.java
index 7ae90e467a..4baae7c274 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientTestBase.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.clientcrash;
+package org.apache.activemq.artemis.tests.integration.clientcrash;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 
 public abstract class ClientTestBase extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
index 6bd2b8047b..0404ed4080 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.clientcrash;
+package org.apache.activemq.artemis.tests.integration.clientcrash;
 
 import java.util.Arrays;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
 
 /**
  * Code to be run in an external VM, via main()
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient2.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient2.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
index 102113765e..dff0166cac 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient2.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.clientcrash;
+package org.apache.activemq.artemis.tests.integration.clientcrash;
 
 import java.util.Arrays;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 
 /**
  * Code to be run in an external VM, via main()
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
similarity index 75%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
index 7cbf0bfb69..b3bde88ee9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.clientcrash;
+package org.apache.activemq.artemis.tests.integration.clientcrash;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQInternalErrorException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveMessage;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 
 public class DummyInterceptor implements Interceptor
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
similarity index 78%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
index 9db6745224..f0a06ed658 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.clientcrash;
+package org.apache.activemq.artemis.tests.integration.clientcrash;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public class DummyInterceptorB implements Interceptor
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/GracefulClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
similarity index 80%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/GracefulClient.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
index 99d76e9326..d44018db73 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/GracefulClient.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.clientcrash;
+package org.apache.activemq.artemis.tests.integration.clientcrash;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 
 /**
  * Code to be run in an external VM, via main()
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/ClusterControllerTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/ClusterControllerTest.java
index 86fe2409c9..12d3f16206 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/ClusterControllerTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster;
+package org.apache.activemq.artemis.tests.integration.cluster;
 
-import org.apache.activemq.api.core.ActiveMQClusterSecurityException;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorImpl;
-import org.apache.activemq.core.server.cluster.ClusterControl;
-import org.apache.activemq.core.server.cluster.ClusterController;
-import org.apache.activemq.core.server.cluster.ActiveMQServerSideProtocolManagerFactory;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQClusterSecurityException;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
+import org.apache.activemq.artemis.core.server.cluster.ClusterControl;
+import org.apache.activemq.artemis.core.server.cluster.ClusterController;
+import org.apache.activemq.artemis.core.server.cluster.ActiveMQServerSideProtocolManagerFactory;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerAction.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerAction.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerAction.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerAction.java
index b270dbf214..8ed8268ce2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerAction.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerAction.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster;
+package org.apache.activemq.artemis.tests.integration.cluster;
 
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.impl.FileLockNodeManager;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager;
 
 public class NodeManagerAction
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java
index 6e1478ffa8..4ef0de99ca 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster;
+package org.apache.activemq.artemis.tests.integration.cluster;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Test;
 
-import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.AWAIT_LIVE;
-import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.CRASH_LIVE;
-import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_BACKUP;
-import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_LIVE;
-import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.HAS_BACKUP;
-import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.HAS_LIVE;
-import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.PAUSE_LIVE;
-import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.RELEASE_BACKUP;
-import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.START_BACKUP;
-import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.START_LIVE;
-import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.STOP_BACKUP;
+import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.AWAIT_LIVE;
+import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.CRASH_LIVE;
+import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_BACKUP;
+import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_LIVE;
+import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.HAS_BACKUP;
+import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.HAS_LIVE;
+import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.PAUSE_LIVE;
+import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.RELEASE_BACKUP;
+import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.START_BACKUP;
+import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.START_LIVE;
+import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.STOP_BACKUP;
 
 public class NodeManagerTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/RealNodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java
similarity index 77%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/RealNodeManagerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java
index 73ae376a89..a6ccc059c2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/RealNodeManagerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java
@@ -14,15 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster;
+package org.apache.activemq.artemis.tests.integration.cluster;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.impl.FileLockNodeManager;
-import org.apache.activemq.tests.util.SpawnedVMSupport;
-import org.apache.activemq.utils.UUID;
+import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager;
+import org.apache.activemq.artemis.utils.UUID;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class RealNodeManagerTest extends NodeManagerTest
@@ -35,7 +37,7 @@ public class RealNodeManagerTest extends NodeManagerTest
       UUID id1 = nodeManager.getUUID();
       nodeManager.stop();
       nodeManager.start();
-      assertEqualsByteArrays(id1.asBytes(), nodeManager.getUUID().asBytes());
+      UnitTestCase.assertEqualsByteArrays(id1.asBytes(), nodeManager.getUUID().asBytes());
       nodeManager.stop();
    }
 
@@ -56,7 +58,7 @@ public class RealNodeManagerTest extends NodeManagerTest
       {
          if (process.exitValue() == 9)
          {
-            fail("failed see output");
+            Assert.fail("failed see output");
          }
       }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java
index d9bf338a7d..648afdd416 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.bridge;
+package org.apache.activemq.artemis.tests.integration.cluster.bridge;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.BridgeConfiguration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.cluster.impl.BridgeImpl;
-import org.apache.activemq.tests.integration.cluster.util.MultiServerTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.BridgeConfiguration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.cluster.impl.BridgeImpl;
+import org.apache.activemq.artemis.tests.integration.cluster.util.MultiServerTestBase;
 import org.junit.Test;
 
 public class BridgeFailoverTest extends MultiServerTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java
index 8886e84a62..3a633f3c72 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java
@@ -14,41 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.bridge;
+package org.apache.activemq.artemis.tests.integration.cluster.bridge;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.QueueControl;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.core.config.BridgeConfiguration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnector;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.cluster.Bridge;
-import org.apache.activemq.core.server.cluster.impl.BridgeImpl;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.core.server.management.ManagementService;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.core.config.BridgeConfiguration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnector;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.cluster.Bridge;
+import org.apache.activemq.artemis.core.server.cluster.impl.BridgeImpl;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.core.server.management.ManagementService;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -265,8 +264,8 @@ public class BridgeReconnectTest extends BridgeTestBase
       for (int i = 0; i < numMessages; i++)
       {
          ClientMessage r1 = cons2.receive(1500);
-         Assert.assertNotNull(r1);
-         Assert.assertEquals(i, r1.getObjectProperty(propKey));
+         assertNotNull(r1);
+         assertEquals(i, r1.getObjectProperty(propKey));
       }
       closeServers();
 
@@ -359,8 +358,8 @@ public class BridgeReconnectTest extends BridgeTestBase
       for (int i = 0; i < numMessages; i++)
       {
          ClientMessage r1 = cons2.receive(1500);
-         Assert.assertNotNull(r1);
-         Assert.assertEquals(i, r1.getObjectProperty(propKey));
+         assertNotNull(r1);
+         assertEquals(i, r1.getObjectProperty(propKey));
       }
       closeServers();
 
@@ -426,7 +425,7 @@ public class BridgeReconnectTest extends BridgeTestBase
 
       final ManagementService managementService = server0.getManagementService();
       QueueControl coreQueueControl = (QueueControl) managementService.getResource(ResourceNames.CORE_QUEUE + queueName);
-      Assert.assertEquals(0, coreQueueControl.getDeliveringCount());
+      assertEquals(0, coreQueueControl.getDeliveringCount());
 
       final int numMessages = NUM_MESSAGES;
 
@@ -443,8 +442,8 @@ public class BridgeReconnectTest extends BridgeTestBase
       for (int i = 0; i < numMessages; i++)
       {
          ClientMessage r1 = cons1.receive(1500);
-         Assert.assertNotNull(r1);
-         Assert.assertEquals(i, r1.getObjectProperty(propKey));
+         assertNotNull(r1);
+         assertEquals(i, r1.getObjectProperty(propKey));
       }
       closeServers();
 
@@ -552,8 +551,8 @@ public class BridgeReconnectTest extends BridgeTestBase
       for (int i = 0; i < numMessages; i++)
       {
          ClientMessage r1 = cons1.receive(30000);
-         Assert.assertNotNull("received expected msg", r1);
-         Assert.assertEquals("property value matches", i, r1.getObjectProperty(propKey));
+         assertNotNull("received expected msg", r1);
+         assertEquals("property value matches", i, r1.getObjectProperty(propKey));
          BridgeReconnectTest.log.info("got message " + r1.getObjectProperty(propKey));
       }
 
@@ -587,10 +586,10 @@ public class BridgeReconnectTest extends BridgeTestBase
 
    private void assertNoMoreConnections()
    {
-      Assert.assertEquals(0, server0.getRemotingService().getConnections().size());
-      Assert.assertEquals(0, server1.getRemotingService().getConnections().size());
+      assertEquals(0, server0.getRemotingService().getConnections().size());
+      assertEquals(0, server1.getRemotingService().getConnections().size());
       if (server2 != null)
-         Assert.assertEquals(0, server2.getRemotingService().getConnections().size());
+         assertEquals(0, server2.getRemotingService().getConnections().size());
    }
 
    @Test
@@ -660,7 +659,7 @@ public class BridgeReconnectTest extends BridgeTestBase
       for (int i = 0; i < numMessages; i++)
       {
          ClientMessage r1 = cons1.receive(1500);
-         Assert.assertNotNull(r1);
+         assertNotNull(r1);
          if (outOfOrder == -1 && i != r1.getIntProperty(propKey).intValue())
          {
             outOfOrder = r1.getIntProperty(propKey).intValue();
@@ -692,7 +691,7 @@ public class BridgeReconnectTest extends BridgeTestBase
       for (int i = 0; i < numMessages; i++)
       {
          ClientMessage r1 = cons1.receive(1500);
-         Assert.assertNotNull("Didn't receive message", r1);
+         assertNotNull("Didn't receive message", r1);
          if (outOfOrder == -1 && i != r1.getIntProperty(propKey).intValue())
          {
             outOfOrder = r1.getIntProperty(propKey).intValue();
@@ -780,7 +779,7 @@ public class BridgeReconnectTest extends BridgeTestBase
       }
 
       System.out.println("Check.. DeliveringCount: " + queue.getDeliveringCount());
-      Assert.assertEquals("Delivering count of a source queue should be zero on connection failure",
+      assertEquals("Delivering count of a source queue should be zero on connection failure",
                           0, queue.getDeliveringCount());
 
       closeServers();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeStartTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java
index 4689aff6ad..74954e2aa5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeStartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.bridge;
+package org.apache.activemq.artemis.tests.integration.cluster.bridge;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,22 +23,22 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.BridgeConfiguration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.cluster.Bridge;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.BridgeConfiguration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.cluster.Bridge;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -89,7 +89,7 @@ public class BridgeStartTest extends ServiceTestBase
       Map server1Params = new HashMap();
       if (isNetty())
       {
-         server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
+         server1Params.put("port", org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
       }
       else
       {
@@ -258,7 +258,7 @@ public class BridgeStartTest extends ServiceTestBase
       Map server1Params = new HashMap();
       if (isNetty())
       {
-         server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
+         server1Params.put("port", org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
       }
       else
       {
@@ -469,7 +469,7 @@ public class BridgeStartTest extends ServiceTestBase
       Map server1Params = new HashMap();
       if (isNetty())
       {
-         server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
+         server1Params.put("port", org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
       }
       else
       {
@@ -623,7 +623,7 @@ public class BridgeStartTest extends ServiceTestBase
       Map server1Params = new HashMap();
       if (isNetty())
       {
-         server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
+         server1Params.put("port", org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
       }
       else
       {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
index b466c3a482..61e6f3bb5c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
@@ -14,14 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.bridge;
+package org.apache.activemq.artemis.tests.integration.cluster.bridge;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -33,39 +27,39 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.BridgeConfiguration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.postoffice.DuplicateIDCache;
-import org.apache.activemq.core.postoffice.impl.PostOfficeImpl;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendLargeMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.MessageReference;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.cluster.impl.BridgeImpl;
-import org.apache.activemq.core.transaction.impl.TransactionImpl;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.LinkedListIterator;
-import org.apache.activemq.utils.ReusableLatch;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.BridgeConfiguration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache;
+import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendContinuationMessage;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendLargeMessage;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.cluster.impl.BridgeImpl;
+import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.utils.LinkedListIterator;
+import org.apache.activemq.artemis.utils.ReusableLatch;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -460,7 +454,7 @@ public class BridgeTest extends ServiceTestBase
    {
       if (isNetty())
       {
-         server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
+         server1Params.put("port", org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1);
       }
       else
       {
@@ -1759,214 +1753,6 @@ public class BridgeTest extends ServiceTestBase
       assertEquals(0, loadQueues(server0).size());
    }
 
-   @Test
-   public void testBridgeWithVeryLargeMessage() throws Exception
-   {
-      ActiveMQServer server0 = null;
-      ActiveMQServer server1 = null;
-
-      final int PAGE_MAX = 1024 * 1024;
-
-      final int PAGE_SIZE = 10 * 1024;
-      ServerLocator locator = null;
-      try
-      {
-
-         Map server0Params = new HashMap();
-         server0 = createClusteredServerWithParams(isNetty(), 0, true, PAGE_SIZE, PAGE_MAX, server0Params);
-
-         Map server1Params = new HashMap();
-         addTargetParameters(server1Params);
-         server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params);
-
-         final String testAddress = "testAddress";
-         final String queueName0 = "queue0";
-         final String forwardAddress = "forwardAddress";
-         final String queueName1 = "queue1";
-
-         Map connectors = new HashMap();
-         TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params);
-
-         TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params);
-         connectors.put(server1tc.getName(), server1tc);
-
-         server0.getConfiguration().setConnectorConfigurations(connectors);
-
-         ArrayList staticConnectors = new ArrayList();
-         staticConnectors.add(server1tc.getName());
-
-         int minLargeMessageSize = 1024 * 1024;
-
-         BridgeConfiguration bridgeConfiguration = new BridgeConfiguration()
-                 .setName("bridge1")
-                 .setQueueName(queueName0)
-                 .setForwardingAddress(forwardAddress)
-                 .setRetryInterval(1000)
-                 .setReconnectAttemptsOnSameNode(-1)
-                 .setUseDuplicateDetection(false)
-                 .setConfirmationWindowSize(1024)
-                 .setStaticConnectors(staticConnectors)
-                 .setMinLargeMessageSize(minLargeMessageSize)
-                 .setProducerWindowSize(minLargeMessageSize / 2);
-
-         List bridgeConfigs = new ArrayList();
-         bridgeConfigs.add(bridgeConfiguration);
-         server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
-
-         CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration()
-                 .setAddress(testAddress)
-                 .setName(queueName0);
-         List queueConfigs0 = new ArrayList();
-         queueConfigs0.add(queueConfig0);
-         server0.getConfiguration().setQueueConfigurations(queueConfigs0);
-
-
-         CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration()
-                 .setAddress(forwardAddress)
-                 .setName(queueName1);
-         List queueConfigs1 = new ArrayList();
-         queueConfigs1.add(queueConfig1);
-         server1.getConfiguration().setQueueConfigurations(queueConfigs1);
-
-         server1.start();
-         server0.start();
-
-         locator = addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(server0tc, server1tc));
-
-         ClientSessionFactory sf0 = locator.createSessionFactory(server0tc);
-
-         ClientSessionFactory sf1 = locator.createSessionFactory(server1tc);
-
-         ClientSession session0 = sf0.createSession(false, true, true);
-
-         ClientSession session1 = sf1.createSession(false, true, true);
-
-         ClientProducer producer0 = session0.createProducer(new SimpleString(testAddress));
-
-         ClientConsumer consumer1 = session1.createConsumer(queueName1);
-
-         session1.start();
-
-         //create a large message bigger than Integer.MAX_VALUE
-         final long largeMessageSize = Integer.MAX_VALUE + 1000L;
-
-         ClientMessage largeMessage = createLargeMessage(session0, largeMessageSize);
-
-         producer0.send(largeMessage);
-
-         session0.commit();
-
-         //check target queue for large message arriving
-         ClientSession.QueueQuery query = session1.queueQuery(new SimpleString(queueName1));
-         long messageCount = query.getMessageCount();
-         int count = 0;
-         //wait for 300 sec max
-         while (messageCount == 0 && count < 300)
-         {
-            count++;
-            Thread.sleep(1000);
-            query = session1.queueQuery(new SimpleString(queueName1));
-            messageCount = query.getMessageCount();
-         }
-
-         if (messageCount == 0)
-         {
-            fail("large message didn't arrived after 5 min!");
-         }
-
-         //receive the message
-         ClientMessage message = consumer1.receive(5000);
-         message.acknowledge();
-
-         File outputFile = new File(getTemporaryDir(), "huge_message_received.dat");
-
-         System.out.println("-----message save to: " + outputFile.getAbsolutePath());
-         FileOutputStream fileOutputStream = new FileOutputStream(outputFile);
-
-         BufferedOutputStream bufferedOutput = new BufferedOutputStream(fileOutputStream);
-
-         message.setOutputStream(bufferedOutput);
-
-         if (!message.waitOutputStreamCompletion(5 * 60 * 1000))
-         {
-            fail("message didn't get received to disk in 5 min. Is the machine slow?");
-         }
-         session1.commit();
-
-         Assert.assertNull(consumer1.receiveImmediate());
-
-         session0.close();
-
-         session1.close();
-
-         sf0.close();
-
-         sf1.close();
-
-      }
-      finally
-      {
-         if (locator != null)
-         {
-            locator.close();
-         }
-         try
-         {
-            server0.stop();
-         }
-         catch (Throwable ignored)
-         {
-         }
-
-         try
-         {
-            server1.stop();
-         }
-         catch (Throwable ignored)
-         {
-         }
-      }
-
-      assertEquals(0, loadQueues(server0).size());
-   }
-
-   private ClientMessage createLargeMessage(ClientSession session, long largeMessageSize) throws Exception
-   {
-
-      File fileInput = new File(getTemporaryDir(), "huge_message_to_send.dat");
-
-      createFile(fileInput, largeMessageSize);
-
-      System.out.println("File created at: " + fileInput.getAbsolutePath());
-
-      ClientMessage message = session.createMessage(ClientMessage.BYTES_TYPE, true);
-
-      FileInputStream fileInputStream = new FileInputStream(fileInput);
-      BufferedInputStream bufferedInput = new BufferedInputStream(fileInputStream);
-
-      message.setBodyInputStream(bufferedInput);
-
-      return message;
-   }
-
-   private static void createFile(final File file, final long fileSize) throws IOException
-   {
-      if (file.exists())
-      {
-         System.out.println("---file already there " + file.length());
-         return;
-      }
-      FileOutputStream fileOut = new FileOutputStream(file);
-      BufferedOutputStream buffOut = new BufferedOutputStream(fileOut);
-      byte[] outBuffer = new byte[1024 * 1024];
-      System.out.println(" --- creating file, size: " + fileSize);
-      for (long i = 0; i < fileSize; i += outBuffer.length)
-      {
-         buffOut.write(outBuffer);
-      }
-      buffOut.close();
-   }
-
    @Test
    public void testNullForwardingAddress() throws Exception
    {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTestBase.java
similarity index 77%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTestBase.java
index 4e729f9473..8bbce917ee 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTestBase.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.bridge;
+package org.apache.activemq.artemis.tests.integration.cluster.bridge;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnector;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.tests.util.InVMNodeManagerServer;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnector;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.tests.util.InVMNodeManagerServer;
 import org.junit.After;
 
 public abstract class BridgeTestBase extends UnitTestCase
@@ -62,14 +62,14 @@ public abstract class BridgeTestBase extends UnitTestCase
 
       if (netty)
       {
-         params.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME,
-                    org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id);
+         params.put(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME,
+                    org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id);
          tc = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params);
 
       }
       else
       {
-         params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id);
+         params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id);
          tc = new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params);
       }
       Configuration serviceConf = createBasicConfig()
@@ -107,14 +107,14 @@ public abstract class BridgeTestBase extends UnitTestCase
 
       if (netty)
       {
-         params.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME,
-                    org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id);
+         params.put(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME,
+                    org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id);
          tc = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params);
 
       }
       else
       {
-         params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id);
+         params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id);
          tc = new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params);
       }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
index 19cdf9a0e3..1832e36844 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.bridge;
+package org.apache.activemq.artemis.tests.integration.cluster.bridge;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,26 +23,26 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.BroadcastGroupConfiguration;
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.BridgeConfiguration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.cluster.Bridge;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.BridgeConfiguration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.cluster.Bridge;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -91,7 +91,7 @@ public class BridgeWithDiscoveryGroupStartTest extends ServiceTestBase
       }
       else
       {
-         server1Params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, 1);
+         server1Params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, 1);
       }
       ActiveMQServer server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params);
       ServerLocator locator = null;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java
index e686974965..13acd8b51f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.bridge;
+package org.apache.activemq.artemis.tests.integration.cluster.bridge;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.cluster.Transformer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.cluster.Transformer;
 
 public class SimpleTransformer implements Transformer
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java
index 810ecbae67..33c4f774a4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 import org.junit.Before;
 
 import org.junit.Test;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.core.message.impl.MessageImpl;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.core.message.impl.MessageImpl;
 
 public class ClusterHeadersRemovedTest extends ClusterTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
index 86d76fc0cb..1ad9862470 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -31,54 +31,54 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.BroadcastGroupConfiguration;
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.core.client.impl.Topology;
-import org.apache.activemq.core.client.impl.TopologyMemberImpl;
-import org.apache.activemq.core.config.ClusterConnectionConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.HAPolicyConfiguration;
-import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.Bindings;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.postoffice.QueueBinding;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.protocol.core.impl.CoreProtocolManagerFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.cluster.ClusterConnection;
-import org.apache.activemq.core.server.cluster.ClusterManager;
-import org.apache.activemq.core.server.cluster.ActiveMQServerSideProtocolManagerFactory;
-import org.apache.activemq.core.server.cluster.RemoteQueueBinding;
-import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl;
-import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum;
-import org.apache.activemq.core.server.group.GroupingHandler;
-import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.core.client.impl.Topology;
+import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl;
+import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.Bindings;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.postoffice.QueueBinding;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.protocol.core.impl.CoreProtocolManagerFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.cluster.ClusterConnection;
+import org.apache.activemq.artemis.core.server.cluster.ClusterManager;
+import org.apache.activemq.artemis.core.server.cluster.ActiveMQServerSideProtocolManagerFactory;
+import org.apache.activemq.artemis.core.server.cluster.RemoteQueueBinding;
+import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionImpl;
+import org.apache.activemq.artemis.core.server.cluster.qourum.SharedNothingBackupQuorum;
+import org.apache.activemq.artemis.core.server.group.GroupingHandler;
+import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -2170,7 +2170,7 @@ public abstract class ClusterTestBase extends ServiceTestBase
 
    /**
     * XXX waitForPrevious actually masks what can be considered a bug: that even controlling for
-    * {@link org.apache.activemq.core.server.ActiveMQServer#waitForInitialization} we still need to wait between starting a shared
+    * {@link org.apache.activemq.artemis.core.server.ActiveMQServer#waitForInitialization} we still need to wait between starting a shared
     * store backup and its live.
     */
    protected void startServers(final int... nodes) throws Exception
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterWithBackupTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterWithBackupTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterWithBackupTest.java
index 126d97c61b..df821e3832 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterWithBackupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterWithBackupTest.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import org.junit.Before;
 
 import org.junit.Test;
 
-
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-
 public class ClusterWithBackupTest extends ClusterTestBase
 {
    private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
index 0f7515bbf0..a3101e288f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,28 +25,28 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-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.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.management.CoreNotificationType;
-import org.apache.activemq.core.postoffice.impl.BindingsImpl;
-import org.apache.activemq.core.server.group.GroupingHandler;
-import org.apache.activemq.core.server.group.UnproposalListener;
-import org.apache.activemq.core.server.group.impl.GroupBinding;
-import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration;
-import org.apache.activemq.core.server.group.impl.Proposal;
-import org.apache.activemq.core.server.group.impl.Response;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.core.server.management.Notification;
-import org.apache.activemq.core.server.management.NotificationListener;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.management.CoreNotificationType;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.core.postoffice.impl.BindingsImpl;
+import org.apache.activemq.artemis.core.server.group.GroupingHandler;
+import org.apache.activemq.artemis.core.server.group.UnproposalListener;
+import org.apache.activemq.artemis.core.server.group.impl.GroupBinding;
+import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
+import org.apache.activemq.artemis.core.server.group.impl.Proposal;
+import org.apache.activemq.artemis.core.server.group.impl.Response;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.core.server.management.Notification;
+import org.apache.activemq.artemis.core.server.management.NotificationListener;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java
index 0f52827150..263e60ef38 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java
index 30d82a8663..afbfe253db 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 public class LargeMessageRedistributionTest extends MessageRedistributionTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java
index bb9a752544..a18fa013a2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
@@ -22,20 +22,21 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.message.impl.MessageImpl;
-import org.apache.activemq.core.server.Bindable;
-import org.apache.activemq.core.server.cluster.impl.Redistributor;
-import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.core.message.impl.MessageImpl;
+import org.apache.activemq.artemis.core.server.Bindable;
+import org.apache.activemq.artemis.core.server.cluster.impl.Redistributor;
+import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -115,22 +116,22 @@ public class MessageRedistributionTest extends ClusterTestBase
       for (int i = 0; i < 5; i++)
       {
          ClientMessage message = getConsumer(1).receive(1000);
-         assertNotNull(message);
+         Assert.assertNotNull(message);
          message.acknowledge();
-         assertNotNull(message.getSimpleStringProperty(Message.HDR_GROUP_ID));
+         Assert.assertNotNull(message.getSimpleStringProperty(Message.HDR_GROUP_ID));
       }
 
       //now consume the non grouped messages from node 1 where they are pinned
       for (int i = 0; i < 5; i++)
       {
          ClientMessage message = getConsumer(0).receive(5000);
-         assertNotNull("" + i, message);
+         Assert.assertNotNull("" + i, message);
          message.acknowledge();
-         assertNull(message.getSimpleStringProperty(Message.HDR_GROUP_ID));
+         Assert.assertNull(message.getSimpleStringProperty(Message.HDR_GROUP_ID));
       }
 
       ClientMessage clientMessage = getConsumer(0).receiveImmediate();
-      assertNull(clientMessage);
+      Assert.assertNull(clientMessage);
 
       // i know the last 5 messages consumed won't be acked yet so i wait for 15
       waitForMessages(1, "queues.testaddress", 15);
@@ -146,13 +147,13 @@ public class MessageRedistributionTest extends ClusterTestBase
          {
             System.out.println();
          }
-         assertNotNull("" + i, message);
+         Assert.assertNotNull("" + i, message);
          message.acknowledge();
-         assertNull(message.getSimpleStringProperty(Message.HDR_GROUP_ID));
+         Assert.assertNull(message.getSimpleStringProperty(Message.HDR_GROUP_ID));
       }
 
       clientMessage = getConsumer(0).receiveImmediate();
-      assertNull(clientMessage);
+      Assert.assertNull(clientMessage);
 
       removeConsumer(0);
 
@@ -162,9 +163,9 @@ public class MessageRedistributionTest extends ClusterTestBase
       for (int i = 0; i < 5; i++)
       {
          ClientMessage message = getConsumer(1).receive(1000);
-         assertNotNull(message);
+         Assert.assertNotNull(message);
          message.acknowledge();
-         assertNotNull(message.getSimpleStringProperty(Message.HDR_GROUP_ID));
+         Assert.assertNotNull(message.getSimpleStringProperty(Message.HDR_GROUP_ID));
       }
       MessageRedistributionTest.log.info("Test done");
    }
@@ -204,7 +205,7 @@ public class MessageRedistributionTest extends ClusterTestBase
 
       Bindable bindable = servers[0].getPostOffice().getBinding(new SimpleString("queue0")).getBindable();
       String debug = ((QueueImpl) bindable).debug();
-      assertFalse(debug.contains(Redistributor.class.getName()));
+      Assert.assertFalse(debug.contains(Redistributor.class.getName()));
       MessageRedistributionTest.log.info("Test done");
    }
 
@@ -291,12 +292,12 @@ public class MessageRedistributionTest extends ClusterTestBase
       for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
       {
          ClientMessage msg = consumer0.receive(5000);
-         assertNotNull(msg);
+         Assert.assertNotNull(msg);
          msg.acknowledge();
-         assertEquals(i, msg.getIntProperty("count").intValue());
+         Assert.assertEquals(i, msg.getIntProperty("count").intValue());
       }
 
-      assertNull(consumer0.receiveImmediate());
+      Assert.assertNull(consumer0.receiveImmediate());
 
       // closing consumer1... it shouldn't redistribute anything as the other nodes don't have such queues
       consumer1.close();
@@ -306,26 +307,26 @@ public class MessageRedistributionTest extends ClusterTestBase
       for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
       {
          ClientMessage msg = consumer2.receive(5000);
-         assertNotNull(msg);
+         Assert.assertNotNull(msg);
          msg.acknowledge();
-         assertEquals(i, msg.getIntProperty("count").intValue());
+         Assert.assertEquals(i, msg.getIntProperty("count").intValue());
       }
 
-      assertNull(consumer2.receiveImmediate());
-      assertNull(consumer0.receiveImmediate());
+      Assert.assertNull(consumer2.receiveImmediate());
+      Assert.assertNull(consumer0.receiveImmediate());
 
       consumer1 = sess1.createConsumer("queue1");
       for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
       {
          ClientMessage msg = consumer1.receive(5000);
-         assertNotNull(msg);
+         Assert.assertNotNull(msg);
          msg.acknowledge();
-         assertEquals(i, msg.getIntProperty("count").intValue());
+         Assert.assertEquals(i, msg.getIntProperty("count").intValue());
       }
 
-      assertNull(consumer0.receiveImmediate());
-      assertNull(consumer1.receiveImmediate());
-      assertNull(consumer2.receiveImmediate());
+      Assert.assertNull(consumer0.receiveImmediate());
+      Assert.assertNull(consumer1.receiveImmediate());
+      Assert.assertNull(consumer2.receiveImmediate());
 
       MessageRedistributionTest.log.info("Test done");
    }
@@ -572,7 +573,7 @@ public class MessageRedistributionTest extends ClusterTestBase
       for (int i = 0; i < 100; i++)
       {
          ClientMessage msg = consumer1.receive(15000);
-         assertNotNull(msg);
+         Assert.assertNotNull(msg);
          msg.acknowledge();
       }
 
@@ -1122,13 +1123,13 @@ public class MessageRedistributionTest extends ClusterTestBase
          producer0.send(msg);
 
          msg = consumer0.receive(5000);
-         assertNotNull(msg);
-         assertEquals(i, msg.getIntProperty("i").intValue());
+         Assert.assertNotNull(msg);
+         Assert.assertEquals(i, msg.getIntProperty("i").intValue());
          // msg.acknowledge(); // -- do not ack message on consumer0, to make sure the messages will be paged
 
          msg = consumer1.receive(5000);
-         assertNotNull(msg);
-         assertEquals(i, msg.getIntProperty("i").intValue());
+         Assert.assertNotNull(msg);
+         Assert.assertEquals(i, msg.getIntProperty("i").intValue());
          msg.acknowledge();
       }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java
index 2e796d52b9..011036243f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java
@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.junit.Assert;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -24,17 +26,17 @@ import java.util.ArrayList;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 
 public class MessageRedistributionWithDiscoveryTest extends ClusterTestBase
 {
-   protected final String groupAddress = getUDPDiscoveryAddress();
+   protected final String groupAddress = UnitTestCase.getUDPDiscoveryAddress();
 
-   protected final int groupPort = getUDPDiscoveryPort();
+   protected final int groupPort = UnitTestCase.getUDPDiscoveryPort();
 
    protected boolean isNetty()
    {
@@ -182,7 +184,7 @@ public class MessageRedistributionWithDiscoveryTest extends ClusterTestBase
       for (int i = 0; i < 100; i++)
       {
          ClientMessage msg = consumer1.receive(15000);
-         assertNotNull(msg);
+         Assert.assertNotNull(msg);
          msg.acknowledge();
       }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java
index 68f9146d0b..45e6e3badf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 
 public class NettyFileStorageSymmetricClusterTest extends SymmetricClusterTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java
index 69068781f2..573cffa279 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 public class NettyFileStorageSymmetricClusterWithBackupTest extends SymmetricClusterWithBackupTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java
index 319c9308fd..2fb44a1be1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 
 public class NettyFileStorageSymmetricClusterWithDiscoveryTest extends SymmetricClusterWithDiscoveryTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java
index 48144131b2..fba6abfdeb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java
index 415019e6e0..2e68a12279 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettySymmetricClusterTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettySymmetricClusterTest.java
index 6375468d99..3610e3ec00 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettySymmetricClusterTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 public class NettySymmetricClusterTest extends SymmetricClusterTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java
index 994cf0a7ce..9a67c3792f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 
 public class NettySymmetricClusterWithBackupTest extends SymmetricClusterWithBackupTest
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java
index 300cdcf336..a18dbb05ce 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 public class NettySymmetricClusterWithDiscoveryTest extends SymmetricClusterWithDiscoveryTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OneWayChainClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/OneWayChainClusterTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OneWayChainClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/OneWayChainClusterTest.java
index d4c31af2a5..27076f4fae 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OneWayChainClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/OneWayChainClusterTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 import org.junit.Before;
 
 import org.junit.Test;
 
-import org.apache.activemq.core.server.cluster.ClusterConnection;
-import org.apache.activemq.core.server.cluster.MessageFlowRecord;
-import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.core.server.cluster.ClusterConnection;
+import org.apache.activemq.artemis.core.server.cluster.MessageFlowRecord;
+import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionImpl;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
index 6488f0066b..3b2785260f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
-import org.apache.activemq.core.server.ActiveMQServer;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 
 
 public class OnewayTwoNodeClusterTest extends ClusterTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
index 16b4511531..d1bc09224a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
index 94a4d935a8..1bd25cce09 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
 import org.junit.Test;
 
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
-
 /**
  * A SymmetricClusterTest
  *
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java
index be2e7a530b..6d37234bf5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 public class SymmetricClusterWithBackupTest extends SymmetricClusterTest
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
index 5ae709689f..752c8f9309 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
@@ -14,18 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 
 public class SymmetricClusterWithDiscoveryTest extends SymmetricClusterTest
 {
    private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER;
 
-   protected final String groupAddress = getUDPDiscoveryAddress();
+   protected final String groupAddress = UnitTestCase.getUDPDiscoveryAddress();
 
-   protected final int groupPort = getUDPDiscoveryPort();
+   protected final int groupPort = UnitTestCase.getUDPDiscoveryPort();
 
    protected boolean isNetty()
    {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java
index 9a40f310a8..37de0465b3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
 
 public class TemporaryQueueClusterTest extends ClusterTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
index eff3851cdf..620f6300d6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java
index fd7fa53a5b..39662c46e5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.distribution;
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 public class TwoWayTwoNodeClusterWithDiscoveryTest extends TwoWayTwoNodeClusterTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java
index 4e1c0efd35..0dd4d5aca6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
 
 /**
  * Validating failover when the size of the message Size > flow Control && message Size < minLargeMessageSize
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
index ef5b19a019..739b1f452b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
@@ -14,31 +14,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.ActiveMQDuplicateIdException;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQTransactionOutcomeUnknownException;
-import org.apache.activemq.api.core.ActiveMQTransactionRolledBackException;
-import org.apache.activemq.api.core.ActiveMQUnBlockedException;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.client.impl.DelegatingSession;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.CountDownSessionFailureListener;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.api.core.ActiveMQDuplicateIdException;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQTransactionOutcomeUnknownException;
+import org.apache.activemq.artemis.api.core.ActiveMQTransactionRolledBackException;
+import org.apache.activemq.artemis.api.core.ActiveMQUnBlockedException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.client.impl.DelegatingSession;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.util.CountDownSessionFailureListener;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
similarity index 59%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
index d9b6afa4e2..ee2edbb387 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,24 +24,25 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.Topology;
-import org.apache.activemq.core.client.impl.TopologyMemberImpl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.config.ScaleDownConfiguration;
-import org.apache.activemq.core.config.ha.ColocatedPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.client.impl.Topology;
+import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.config.ScaleDownConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ColocatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -86,52 +87,52 @@ public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase
          waitForRemoteBackup(sessionFactory1, 10);
          Topology topology = serverLocator.getTopology();
          Collection members = topology.getMembers();
-         assertEquals(members.size(), 2);
+         Assert.assertEquals(members.size(), 2);
          Map backupServers0 = server0.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers0.size(), 1);
+         Assert.assertEquals(backupServers0.size(), 1);
          Map backupServers1 = server1.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers1.size(), 1);
+         Assert.assertEquals(backupServers1.size(), 1);
          ActiveMQServer backupServer0 = backupServers0.values().iterator().next();
          ActiveMQServer backupServer1 = backupServers1.values().iterator().next();
          waitForRemoteBackupSynchronization(backupServer0);
          waitForRemoteBackupSynchronization(backupServer1);
-         assertEquals(server0.getNodeID(), backupServer1.getNodeID());
-         assertEquals(server1.getNodeID(), backupServer0.getNodeID());
+         Assert.assertEquals(server0.getNodeID(), backupServer1.getNodeID());
+         Assert.assertEquals(server1.getNodeID(), backupServer0.getNodeID());
          Set backupAcceptors0 = backupServer0.getConfiguration().getAcceptorConfigurations();
-         assertEquals(1, backupAcceptors0.size());
-         assertEquals("61716", backupAcceptors0.iterator().next().getParams().get("port"));
+         Assert.assertEquals(1, backupAcceptors0.size());
+         Assert.assertEquals("61716", backupAcceptors0.iterator().next().getParams().get("port"));
          Set backupAcceptors1 = backupServer1.getConfiguration().getAcceptorConfigurations();
-         assertEquals(1, backupAcceptors1.size());
-         assertEquals("61717", backupAcceptors1.iterator().next().getParams().get("port"));
+         Assert.assertEquals(1, backupAcceptors1.size());
+         Assert.assertEquals("61717", backupAcceptors1.iterator().next().getParams().get("port"));
          Map connectorConfigurations0 = backupServer0.getConfiguration().getConnectorConfigurations();
-         assertEquals(2, connectorConfigurations0.size());
-         assertEquals("61716", connectorConfigurations0.get("liveConnector0").getParams().get("port"));
-         assertEquals("61617", connectorConfigurations0.get("remoteConnector0").getParams().get("port"));
+         Assert.assertEquals(2, connectorConfigurations0.size());
+         Assert.assertEquals("61716", connectorConfigurations0.get("liveConnector0").getParams().get("port"));
+         Assert.assertEquals("61617", connectorConfigurations0.get("remoteConnector0").getParams().get("port"));
          Map connectorConfigurations1 = backupServer1.getConfiguration().getConnectorConfigurations();
-         assertEquals(2, connectorConfigurations1.size());
-         assertEquals("61717", connectorConfigurations1.get("liveConnector1").getParams().get("port"));
-         assertEquals("61616", connectorConfigurations1.get("remoteConnector1").getParams().get("port"));
+         Assert.assertEquals(2, connectorConfigurations1.size());
+         Assert.assertEquals("61717", connectorConfigurations1.get("liveConnector1").getParams().get("port"));
+         Assert.assertEquals("61616", connectorConfigurations1.get("remoteConnector1").getParams().get("port"));
          if (!replicated)
          {
-            assertEquals(server0.getConfiguration().getJournalDirectory(), backupServer1.getConfiguration().getJournalDirectory());
-            assertEquals(server0.getConfiguration().getBindingsDirectory(), backupServer1.getConfiguration().getBindingsDirectory());
-            assertEquals(server0.getConfiguration().getLargeMessagesDirectory(), backupServer1.getConfiguration().getLargeMessagesDirectory());
-            assertEquals(server0.getConfiguration().getPagingDirectory(), backupServer1.getConfiguration().getPagingDirectory());
-            assertEquals(server1.getConfiguration().getJournalDirectory(), backupServer0.getConfiguration().getJournalDirectory());
-            assertEquals(server1.getConfiguration().getBindingsDirectory(), backupServer0.getConfiguration().getBindingsDirectory());
-            assertEquals(server1.getConfiguration().getLargeMessagesDirectory(), backupServer0.getConfiguration().getLargeMessagesDirectory());
-            assertEquals(server1.getConfiguration().getPagingDirectory(), backupServer0.getConfiguration().getPagingDirectory());
+            Assert.assertEquals(server0.getConfiguration().getJournalDirectory(), backupServer1.getConfiguration().getJournalDirectory());
+            Assert.assertEquals(server0.getConfiguration().getBindingsDirectory(), backupServer1.getConfiguration().getBindingsDirectory());
+            Assert.assertEquals(server0.getConfiguration().getLargeMessagesDirectory(), backupServer1.getConfiguration().getLargeMessagesDirectory());
+            Assert.assertEquals(server0.getConfiguration().getPagingDirectory(), backupServer1.getConfiguration().getPagingDirectory());
+            Assert.assertEquals(server1.getConfiguration().getJournalDirectory(), backupServer0.getConfiguration().getJournalDirectory());
+            Assert.assertEquals(server1.getConfiguration().getBindingsDirectory(), backupServer0.getConfiguration().getBindingsDirectory());
+            Assert.assertEquals(server1.getConfiguration().getLargeMessagesDirectory(), backupServer0.getConfiguration().getLargeMessagesDirectory());
+            Assert.assertEquals(server1.getConfiguration().getPagingDirectory(), backupServer0.getConfiguration().getPagingDirectory());
          }
          else
          {
-            assertNotEquals(server0.getConfiguration().getJournalDirectory(), backupServer1.getConfiguration().getJournalDirectory());
-            assertNotEquals(server0.getConfiguration().getBindingsDirectory(), backupServer1.getConfiguration().getBindingsDirectory());
-            assertNotEquals(server0.getConfiguration().getLargeMessagesDirectory(), backupServer1.getConfiguration().getLargeMessagesDirectory());
-            assertNotEquals(server0.getConfiguration().getPagingDirectory(), backupServer1.getConfiguration().getPagingDirectory());
-            assertNotEquals(server1.getConfiguration().getJournalDirectory(), backupServer0.getConfiguration().getJournalDirectory());
-            assertNotEquals(server1.getConfiguration().getBindingsDirectory(), backupServer0.getConfiguration().getBindingsDirectory());
-            assertNotEquals(server1.getConfiguration().getLargeMessagesDirectory(), backupServer0.getConfiguration().getLargeMessagesDirectory());
-            assertNotEquals(server1.getConfiguration().getPagingDirectory(), backupServer0.getConfiguration().getPagingDirectory());
+            Assert.assertNotEquals(server0.getConfiguration().getJournalDirectory(), backupServer1.getConfiguration().getJournalDirectory());
+            Assert.assertNotEquals(server0.getConfiguration().getBindingsDirectory(), backupServer1.getConfiguration().getBindingsDirectory());
+            Assert.assertNotEquals(server0.getConfiguration().getLargeMessagesDirectory(), backupServer1.getConfiguration().getLargeMessagesDirectory());
+            Assert.assertNotEquals(server0.getConfiguration().getPagingDirectory(), backupServer1.getConfiguration().getPagingDirectory());
+            Assert.assertNotEquals(server1.getConfiguration().getJournalDirectory(), backupServer0.getConfiguration().getJournalDirectory());
+            Assert.assertNotEquals(server1.getConfiguration().getBindingsDirectory(), backupServer0.getConfiguration().getBindingsDirectory());
+            Assert.assertNotEquals(server1.getConfiguration().getLargeMessagesDirectory(), backupServer0.getConfiguration().getLargeMessagesDirectory());
+            Assert.assertNotEquals(server1.getConfiguration().getPagingDirectory(), backupServer0.getConfiguration().getPagingDirectory());
          }
       }
       finally
@@ -169,50 +170,50 @@ public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase
          waitForRemoteBackup(sessionFactory1, 10);
          Topology topology = serverLocator.getTopology();
          Collection members = topology.getMembers();
-         assertEquals(members.size(), 2);
+         Assert.assertEquals(members.size(), 2);
          Map backupServers0 = server0.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers0.size(), 1);
+         Assert.assertEquals(backupServers0.size(), 1);
          Map backupServers1 = server1.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers1.size(), 1);
+         Assert.assertEquals(backupServers1.size(), 1);
          ActiveMQServer backupServer0 = backupServers0.values().iterator().next();
          ActiveMQServer backupServer1 = backupServers1.values().iterator().next();
          waitForRemoteBackupSynchronization(backupServer0);
          waitForRemoteBackupSynchronization(backupServer1);
-         assertEquals(server0.getNodeID(), backupServer1.getNodeID());
-         assertEquals(server1.getNodeID(), backupServer0.getNodeID());
+         Assert.assertEquals(server0.getNodeID(), backupServer1.getNodeID());
+         Assert.assertEquals(server1.getNodeID(), backupServer0.getNodeID());
          Set backupAcceptors0 = backupServer0.getConfiguration().getAcceptorConfigurations();
-         assertEquals(0, backupAcceptors0.size());
+         Assert.assertEquals(0, backupAcceptors0.size());
          Set backupAcceptors1 = backupServer1.getConfiguration().getAcceptorConfigurations();
-         assertEquals(0, backupAcceptors1.size());
+         Assert.assertEquals(0, backupAcceptors1.size());
          Map connectorConfigurations0 = backupServer0.getConfiguration().getConnectorConfigurations();
-         assertEquals(2, connectorConfigurations0.size());
-         assertEquals("61616", connectorConfigurations0.get("liveConnector0").getParams().get("port"));
-         assertEquals("61617", connectorConfigurations0.get("remoteConnector0").getParams().get("port"));
+         Assert.assertEquals(2, connectorConfigurations0.size());
+         Assert.assertEquals("61616", connectorConfigurations0.get("liveConnector0").getParams().get("port"));
+         Assert.assertEquals("61617", connectorConfigurations0.get("remoteConnector0").getParams().get("port"));
          Map connectorConfigurations1 = backupServer1.getConfiguration().getConnectorConfigurations();
-         assertEquals(2, connectorConfigurations1.size());
-         assertEquals("61617", connectorConfigurations1.get("liveConnector1").getParams().get("port"));
-         assertEquals("61616", connectorConfigurations1.get("remoteConnector1").getParams().get("port"));
+         Assert.assertEquals(2, connectorConfigurations1.size());
+         Assert.assertEquals("61617", connectorConfigurations1.get("liveConnector1").getParams().get("port"));
+         Assert.assertEquals("61616", connectorConfigurations1.get("remoteConnector1").getParams().get("port"));
          if (!replicated)
          {
-            assertEquals(server0.getConfiguration().getJournalDirectory(), backupServer1.getConfiguration().getJournalDirectory());
-            assertEquals(server0.getConfiguration().getBindingsDirectory(), backupServer1.getConfiguration().getBindingsDirectory());
-            assertEquals(server0.getConfiguration().getLargeMessagesDirectory(), backupServer1.getConfiguration().getLargeMessagesDirectory());
-            assertEquals(server0.getConfiguration().getPagingDirectory(), backupServer1.getConfiguration().getPagingDirectory());
-            assertEquals(server1.getConfiguration().getJournalDirectory(), backupServer0.getConfiguration().getJournalDirectory());
-            assertEquals(server1.getConfiguration().getBindingsDirectory(), backupServer0.getConfiguration().getBindingsDirectory());
-            assertEquals(server1.getConfiguration().getLargeMessagesDirectory(), backupServer0.getConfiguration().getLargeMessagesDirectory());
-            assertEquals(server1.getConfiguration().getPagingDirectory(), backupServer0.getConfiguration().getPagingDirectory());
+            Assert.assertEquals(server0.getConfiguration().getJournalDirectory(), backupServer1.getConfiguration().getJournalDirectory());
+            Assert.assertEquals(server0.getConfiguration().getBindingsDirectory(), backupServer1.getConfiguration().getBindingsDirectory());
+            Assert.assertEquals(server0.getConfiguration().getLargeMessagesDirectory(), backupServer1.getConfiguration().getLargeMessagesDirectory());
+            Assert.assertEquals(server0.getConfiguration().getPagingDirectory(), backupServer1.getConfiguration().getPagingDirectory());
+            Assert.assertEquals(server1.getConfiguration().getJournalDirectory(), backupServer0.getConfiguration().getJournalDirectory());
+            Assert.assertEquals(server1.getConfiguration().getBindingsDirectory(), backupServer0.getConfiguration().getBindingsDirectory());
+            Assert.assertEquals(server1.getConfiguration().getLargeMessagesDirectory(), backupServer0.getConfiguration().getLargeMessagesDirectory());
+            Assert.assertEquals(server1.getConfiguration().getPagingDirectory(), backupServer0.getConfiguration().getPagingDirectory());
          }
          else
          {
-            assertNotEquals(server0.getConfiguration().getJournalDirectory(), backupServer1.getConfiguration().getJournalDirectory());
-            assertNotEquals(server0.getConfiguration().getBindingsDirectory(), backupServer1.getConfiguration().getBindingsDirectory());
-            assertNotEquals(server0.getConfiguration().getLargeMessagesDirectory(), backupServer1.getConfiguration().getLargeMessagesDirectory());
-            assertNotEquals(server0.getConfiguration().getPagingDirectory(), backupServer1.getConfiguration().getPagingDirectory());
-            assertNotEquals(server1.getConfiguration().getJournalDirectory(), backupServer0.getConfiguration().getJournalDirectory());
-            assertNotEquals(server1.getConfiguration().getBindingsDirectory(), backupServer0.getConfiguration().getBindingsDirectory());
-            assertNotEquals(server1.getConfiguration().getLargeMessagesDirectory(), backupServer0.getConfiguration().getLargeMessagesDirectory());
-            assertNotEquals(server1.getConfiguration().getPagingDirectory(), backupServer0.getConfiguration().getPagingDirectory());
+            Assert.assertNotEquals(server0.getConfiguration().getJournalDirectory(), backupServer1.getConfiguration().getJournalDirectory());
+            Assert.assertNotEquals(server0.getConfiguration().getBindingsDirectory(), backupServer1.getConfiguration().getBindingsDirectory());
+            Assert.assertNotEquals(server0.getConfiguration().getLargeMessagesDirectory(), backupServer1.getConfiguration().getLargeMessagesDirectory());
+            Assert.assertNotEquals(server0.getConfiguration().getPagingDirectory(), backupServer1.getConfiguration().getPagingDirectory());
+            Assert.assertNotEquals(server1.getConfiguration().getJournalDirectory(), backupServer0.getConfiguration().getJournalDirectory());
+            Assert.assertNotEquals(server1.getConfiguration().getBindingsDirectory(), backupServer0.getConfiguration().getBindingsDirectory());
+            Assert.assertNotEquals(server1.getConfiguration().getLargeMessagesDirectory(), backupServer0.getConfiguration().getLargeMessagesDirectory());
+            Assert.assertNotEquals(server1.getConfiguration().getPagingDirectory(), backupServer0.getConfiguration().getPagingDirectory());
          }
       }
       finally
@@ -255,17 +256,17 @@ public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase
          waitForRemoteBackup(sessionFactory1, 10);
          Topology topology = serverLocator.getTopology();
          Collection members = topology.getMembers();
-         assertEquals(members.size(), 2);
+         Assert.assertEquals(members.size(), 2);
          Map backupServers0 = server0.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers0.size(), 1);
+         Assert.assertEquals(backupServers0.size(), 1);
          Map backupServers1 = server1.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers1.size(), 1);
+         Assert.assertEquals(backupServers1.size(), 1);
          ActiveMQServer backupServer0 = backupServers0.values().iterator().next();
          ActiveMQServer backupServer1 = backupServers1.values().iterator().next();
          waitForRemoteBackupSynchronization(backupServer0);
          waitForRemoteBackupSynchronization(backupServer1);
-         assertEquals(server0.getNodeID(), backupServer1.getNodeID());
-         assertEquals(server1.getNodeID(), backupServer0.getNodeID());
+         Assert.assertEquals(server0.getNodeID(), backupServer1.getNodeID());
+         Assert.assertEquals(server1.getNodeID(), backupServer0.getNodeID());
          server2.start();
          //just give server2 time to try both server 0 and 1
          ClientSessionFactory sessionFactory2 = serverLocator.createSessionFactory(liveConnector2);
@@ -273,19 +274,19 @@ public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase
          ClientSessionFactory sessionFactory3 = serverLocator.createSessionFactory(liveConnector3);
          waitForRemoteBackup(sessionFactory2, 10);
          waitForRemoteBackup(sessionFactory3, 10);
-         assertEquals(members.size(), 2);
+         Assert.assertEquals(members.size(), 2);
          Map backupServers2 = server2.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers2.size(), 1);
+         Assert.assertEquals(backupServers2.size(), 1);
          Map backupServers3 = server3.getClusterManager().getHAManager().getBackupServers();
-         assertEquals(backupServers3.size(), 1);
+         Assert.assertEquals(backupServers3.size(), 1);
          ActiveMQServer backupServer2 = backupServers2.values().iterator().next();
          ActiveMQServer backupServer3 = backupServers3.values().iterator().next();
          waitForRemoteBackupSynchronization(backupServer2);
          waitForRemoteBackupSynchronization(backupServer3);
-         assertEquals(server0.getNodeID(), backupServer1.getNodeID());
-         assertEquals(server1.getNodeID(), backupServer0.getNodeID());
-         assertEquals(server2.getNodeID(), backupServer3.getNodeID());
-         assertEquals(server3.getNodeID(), backupServer2.getNodeID());
+         Assert.assertEquals(server0.getNodeID(), backupServer1.getNodeID());
+         Assert.assertEquals(server1.getNodeID(), backupServer0.getNodeID());
+         Assert.assertEquals(server2.getNodeID(), backupServer3.getNodeID());
+         Assert.assertEquals(server3.getNodeID(), backupServer2.getNodeID());
       }
       finally
       {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupAuthenticationTest.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupAuthenticationTest.java
index dbf3574884..0fe5124ad9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupAuthenticationTest.java
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
-import org.apache.activemq.api.core.ActiveMQException;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -24,12 +24,12 @@ import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 
 public class BackupAuthenticationTest extends FailoverTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
index 0741d44a8f..5314385ff4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.io.File;
 import java.io.RandomAccessFile;
@@ -24,27 +24,27 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Pair;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.journal.impl.JournalFile;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.paging.PagingStore;
-import org.apache.activemq.core.persistence.impl.journal.DescribeJournal;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.integration.cluster.util.BackupSyncDelay;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
-import org.apache.activemq.utils.UUID;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Pair;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.journal.impl.JournalFile;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.paging.PagingStore;
+import org.apache.activemq.artemis.core.persistence.impl.journal.DescribeJournal;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.tests.integration.cluster.util.BackupSyncDelay;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.utils.UUID;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -201,7 +201,7 @@ public class BackupSyncJournalTest extends FailoverTestBase
    protected void assertNoMoreMessages() throws ActiveMQException
    {
       session.start();
-      ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
+      ClientConsumer consumer = session.createConsumer(ADDRESS);
       ClientMessage msg = consumer.receiveImmediate();
       assertNull("there should be no more messages to receive! " + msg, msg);
       consumer.close();
@@ -377,10 +377,10 @@ public class BackupSyncJournalTest extends FailoverTestBase
    protected void createProducerSendSomeMessages() throws ActiveMQException
    {
       session = addClientSession(sessionFactory.createSession(true, true));
-      session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
+      session.createQueue(ADDRESS, ADDRESS, null, true);
       if (producer != null)
          producer.close();
-      producer = addClientProducer(session.createProducer(FailoverTestBase.ADDRESS));
+      producer = addClientProducer(session.createProducer(ADDRESS));
       sendMessages(session, producer, n_msgs);
       session.commit();
    }
@@ -388,7 +388,7 @@ public class BackupSyncJournalTest extends FailoverTestBase
    protected void receiveMsgsInRange(int start, int end) throws ActiveMQException
    {
       session.start();
-      ClientConsumer consumer = addClientConsumer(session.createConsumer(FailoverTestBase.ADDRESS));
+      ClientConsumer consumer = addClientConsumer(session.createConsumer(ADDRESS));
       receiveMessages(consumer, start, end, true);
       consumer.close();
       session.commit();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java
index 3b799ba29e..3e66bb9e4c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.io.File;
@@ -30,13 +31,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
 
 public class BackupSyncLargeMessageTest extends BackupSyncJournalTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncPagingTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncPagingTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncPagingTest.java
index de5cd0cb39..c5619a34cf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncPagingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncPagingTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -22,11 +22,11 @@ import org.junit.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 
 public class BackupSyncPagingTest extends BackupSyncJournalTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java
index 120c0670b1..ff946e9f9f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.HashSet;
 
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
-import org.apache.activemq.tests.integration.cluster.util.SameProcessActiveMQServer;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.cluster.util.SameProcessActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor.java
similarity index 74%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor.java
index 1f805b212a..c16e329a14 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public class DelayInterceptor implements Interceptor
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor2.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor2.java
similarity index 79%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor2.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor2.java
index df62ae300f..2bed2f4d0f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor2.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor2.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public class DelayInterceptor2 implements Interceptor
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor3.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor3.java
similarity index 74%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor3.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor3.java
index 8e17a00928..bbdc64be43 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor3.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor3.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public class DelayInterceptor3 implements Interceptor
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java
index 4b9494885e..aa91b4b176 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 
 public class DiscoveryClusterWithBackupFailoverTest extends ClusterWithBackupFailoverTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailBackAutoTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackAutoTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailBackAutoTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackAutoTest.java
index e93fce0667..4d781c6660 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailBackAutoTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackAutoTest.java
@@ -14,30 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.server.cluster.ha.SharedStoreSlavePolicy;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.CountDownSessionFailureListener;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
-import org.junit.Assert;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreSlavePolicy;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.CountDownSessionFailureListener;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -77,7 +76,7 @@ public class FailBackAutoTest extends FailoverTestBase
 
       log.info("Server Crash!!!");
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
       ClientMessage message = session.createMessage(true);
 
@@ -154,7 +153,7 @@ public class FailBackAutoTest extends FailoverTestBase
 
       liveServer.crash(session);
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
       ClientMessage message = session.createMessage(true);
 
@@ -209,7 +208,7 @@ public class FailBackAutoTest extends FailoverTestBase
       createSessionFactory();
       ClientSession session = sendAndConsume(sf, true);
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
       sendMessages(session, producer, NUM_MESSAGES);
       session.commit();
@@ -217,9 +216,9 @@ public class FailBackAutoTest extends FailoverTestBase
       crash(session);
 
       session.start();
-      ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
+      ClientConsumer consumer = session.createConsumer(ADDRESS);
       receiveMessages(consumer, 0, NUM_MESSAGES, true);
-      producer = session.createProducer(FailoverTestBase.ADDRESS);
+      producer = session.createProducer(ADDRESS);
       sendMessages(session, producer, 2 * NUM_MESSAGES);
       session.commit();
       assertFalse("must NOT be a backup", liveServer.getServer().getHAPolicy().isBackup());
@@ -249,8 +248,8 @@ public class FailBackAutoTest extends FailoverTestBase
    private void wrapUpSessionFactory()
    {
       sf.close();
-      Assert.assertEquals(0, sf.numSessions());
-      Assert.assertEquals(0, sf.numConnections());
+      assertEquals(0, sf.numSessions());
+      assertEquals(0, sf.numConnections());
    }
 
    @Override
@@ -306,10 +305,10 @@ public class FailBackAutoTest extends FailoverTestBase
 
       if (createQueue)
       {
-         session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
+         session.createQueue(ADDRESS, ADDRESS, null, true);
       }
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
       final int numMessages = 1000;
 
@@ -325,7 +324,7 @@ public class FailBackAutoTest extends FailoverTestBase
          producer.send(message);
       }
 
-      ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
+      ClientConsumer consumer = session.createConsumer(ADDRESS);
 
       session.start();
 
@@ -333,9 +332,9 @@ public class FailBackAutoTest extends FailoverTestBase
       {
          ClientMessage message2 = consumer.receive();
 
-         Assert.assertEquals("aardvarks", message2.getBodyBuffer().readString());
+         assertEquals("aardvarks", message2.getBodyBuffer().readString());
 
-         Assert.assertEquals(i, message2.getObjectProperty(new SimpleString("count")));
+         assertEquals(i, message2.getObjectProperty(new SimpleString("count")));
 
          message2.acknowledge();
       }
@@ -344,7 +343,7 @@ public class FailBackAutoTest extends FailoverTestBase
 
       consumer.close();
 
-      Assert.assertNull(message3);
+      assertNull(message3);
 
       return session;
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailBackManualTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java
similarity index 77%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailBackManualTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java
index 4bc9f7166f..9ac925ee22 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailBackManualTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java
@@ -14,27 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
-import org.apache.activemq.tests.util.CountDownSessionFailureListener;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
-import org.junit.Assert;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.tests.util.CountDownSessionFailureListener;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -74,7 +73,7 @@ public class FailBackManualTest extends FailoverTestBase
       assertTrue(listener.getLatch()
                     .await(5, TimeUnit.SECONDS));
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
       ClientMessage message = session.createMessage(true);
 
@@ -100,9 +99,9 @@ public class FailBackManualTest extends FailoverTestBase
 
       sf.close();
 
-      Assert.assertEquals(0, sf.numSessions());
+      assertEquals(0, sf.numSessions());
 
-      Assert.assertEquals(0, sf.numConnections());
+      assertEquals(0, sf.numConnections());
    }
 
 
@@ -156,10 +155,10 @@ public class FailBackManualTest extends FailoverTestBase
 
       if (createQueue)
       {
-         session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, false);
+         session.createQueue(ADDRESS, ADDRESS, null, false);
       }
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
       final int numMessages = 1000;
 
@@ -176,7 +175,7 @@ public class FailBackManualTest extends FailoverTestBase
          producer.send(message);
       }
 
-      ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
+      ClientConsumer consumer = session.createConsumer(ADDRESS);
 
       session.start();
 
@@ -184,17 +183,17 @@ public class FailBackManualTest extends FailoverTestBase
       {
          ClientMessage message2 = consumer.receive();
 
-         Assert.assertEquals("aardvarks", message2.getBodyBuffer()
+         assertEquals("aardvarks", message2.getBodyBuffer()
             .readString());
 
-         Assert.assertEquals(i, message2.getObjectProperty(new SimpleString("count")));
+         assertEquals(i, message2.getObjectProperty(new SimpleString("count")));
 
          message2.acknowledge();
       }
 
       ClientMessage message3 = consumer.receiveImmediate();
 
-      Assert.assertNull(message3);
+      assertNull(message3);
 
       return session;
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverListenerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java
index a4f1ed3d2a..3e30ff94a9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java
@@ -14,31 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.FailoverEventListener;
-import org.apache.activemq.api.core.client.FailoverEventType;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
-import org.junit.Assert;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.FailoverEventListener;
+import org.apache.activemq.artemis.api.core.client.FailoverEventType;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -85,7 +84,7 @@ public class FailoverListenerTest extends FailoverTestBase
       //the backup server should be online by now
       assertEquals(FailoverEventType.FAILOVER_COMPLETED, listener.getFailoverEventType().get(1));
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
       ClientMessage message = session.createMessage(true);
 
@@ -190,8 +189,8 @@ public class FailoverListenerTest extends FailoverTestBase
    private void wrapUpSessionFactory()
    {
       sf.close();
-      Assert.assertEquals("Expecting 0 sessions", 0, sf.numSessions());
-      Assert.assertEquals("Expecting 0 connections", 0, sf.numConnections());
+      assertEquals("Expecting 0 sessions", 0, sf.numSessions());
+      assertEquals("Expecting 0 connections", 0, sf.numConnections());
    }
 
    @Override
@@ -245,10 +244,10 @@ public class FailoverListenerTest extends FailoverTestBase
 
       if (createQueue)
       {
-         session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
+         session.createQueue(ADDRESS, ADDRESS, null, true);
       }
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
       final int numMessages = 1000;
 
@@ -264,7 +263,7 @@ public class FailoverListenerTest extends FailoverTestBase
          producer.send(message);
       }
 
-      ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
+      ClientConsumer consumer = session.createConsumer(ADDRESS);
 
       session.start();
 
@@ -272,9 +271,9 @@ public class FailoverListenerTest extends FailoverTestBase
       {
          ClientMessage message2 = consumer.receive();
 
-         Assert.assertEquals("aardvarks", message2.getBodyBuffer().readString());
+         assertEquals("aardvarks", message2.getBodyBuffer().readString());
 
-         Assert.assertEquals(i, message2.getObjectProperty(new SimpleString("count")));
+         assertEquals(i, message2.getObjectProperty(new SimpleString("count")));
 
          message2.acknowledge();
       }
@@ -283,7 +282,7 @@ public class FailoverListenerTest extends FailoverTestBase
 
       consumer.close();
 
-      Assert.assertNull(message3);
+      assertNull(message3);
 
       return session;
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
similarity index 76%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
index b5f0af5d76..70b0173efb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
@@ -14,28 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnection;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnection;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 
 public class FailoverOnFlowControlTest extends FailoverTestBase
 {
@@ -93,9 +93,9 @@ public class FailoverOnFlowControlTest extends FailoverTestBase
       ClientSession session = sf.createSession(true, true);
       sessionList.add(session);
 
-      session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
+      session.createQueue(ADDRESS, ADDRESS, null, true);
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
 
       final int numMessages = 10;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
index 019ffa937b..c27760fdd5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
@@ -27,38 +27,38 @@ import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQDuplicateIdException;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQObjectClosedException;
-import org.apache.activemq.api.core.ActiveMQTransactionOutcomeUnknownException;
-import org.apache.activemq.api.core.ActiveMQTransactionRolledBackException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.server.cluster.ha.BackupPolicy;
-import org.apache.activemq.core.server.cluster.ha.HAPolicy;
-import org.apache.activemq.core.server.cluster.ha.ReplicaPolicy;
-import org.apache.activemq.core.server.cluster.ha.ReplicatedPolicy;
-import org.apache.activemq.core.server.cluster.ha.SharedStoreMasterPolicy;
-import org.apache.activemq.core.server.cluster.ha.SharedStoreSlavePolicy;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
-import org.apache.activemq.tests.util.CountDownSessionFailureListener;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.api.core.ActiveMQDuplicateIdException;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
+import org.apache.activemq.artemis.api.core.ActiveMQTransactionOutcomeUnknownException;
+import org.apache.activemq.artemis.api.core.ActiveMQTransactionRolledBackException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.server.cluster.ha.BackupPolicy;
+import org.apache.activemq.artemis.core.server.cluster.ha.HAPolicy;
+import org.apache.activemq.artemis.core.server.cluster.ha.ReplicaPolicy;
+import org.apache.activemq.artemis.core.server.cluster.ha.ReplicatedPolicy;
+import org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreMasterPolicy;
+import org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreSlavePolicy;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.tests.util.CountDownSessionFailureListener;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -168,22 +168,22 @@ public class FailoverTest extends FailoverTestBase
       };
       Thread t = new Thread(r);
       t.start();
-      assertTrue("latch released", latch.await(10, TimeUnit.SECONDS));
+      Assert.assertTrue("latch released", latch.await(10, TimeUnit.SECONDS));
       crash(session);
       latchFailed.countDown();
       t.join(30000);
       if (t.isAlive())
       {
          t.interrupt();
-         fail("Thread still alive");
+         Assert.fail("Thread still alive");
       }
-      assertTrue(backupServer.getServer().waitForActivation(5, TimeUnit.SECONDS));
+      Assert.assertTrue(backupServer.getServer().waitForActivation(5, TimeUnit.SECONDS));
       ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
       session.start();
       for (int i = 0; i < 500; i++)
       {
          ClientMessage m = consumer.receive(1000);
-         assertNotNull("message #=" + i, m);
+         Assert.assertNotNull("message #=" + i, m);
          // assertEquals(i, m.getIntProperty("counter").intValue());
       }
    }
@@ -258,7 +258,7 @@ public class FailoverTest extends FailoverTestBase
       log.info("crashing session");
       crash(session);
       endLatch.await(60, TimeUnit.SECONDS);
-      assertTrue("received only " + received.size(), received.size() == 500);
+      Assert.assertTrue("received only " + received.size(), received.size() == 500);
 
       session.close();
    }
@@ -342,7 +342,7 @@ public class FailoverTest extends FailoverTestBase
             }
             catch (Exception e)
             {
-               fail("failing due to exception " + e);
+               Assert.fail("failing due to exception " + e);
             }
 
          }
@@ -378,7 +378,7 @@ public class FailoverTest extends FailoverTestBase
       crash(session);
       endLatch.await(60, TimeUnit.SECONDS);
       t.join();
-      assertTrue("received only " + received.size(), received.size() == 500);
+      Assert.assertTrue("received only " + received.size(), received.size() == 500);
 
       session.close();
    }
@@ -433,8 +433,8 @@ public class FailoverTest extends FailoverTestBase
       for (int i = 0; i < 500; i++)
       {
          ClientMessage m = consumer.receive(1000);
-         assertNotNull(m);
-         assertEquals(i, m.getIntProperty("counter").intValue());
+         Assert.assertNotNull(m);
+         Assert.assertEquals(i, m.getIntProperty("counter").intValue());
       }
    }
 
@@ -487,7 +487,7 @@ public class FailoverTest extends FailoverTestBase
       session.start();
 
       ClientMessage m = consumer.receive(1000);
-      assertNull(m);
+      Assert.assertNull(m);
 
    }
 
@@ -541,7 +541,7 @@ public class FailoverTest extends FailoverTestBase
 
       crash(session);
 
-      assertTrue(latch.await(1, TimeUnit.SECONDS));
+      Assert.assertTrue(latch.await(1, TimeUnit.SECONDS));
 
    }
 
@@ -620,18 +620,18 @@ public class FailoverTest extends FailoverTestBase
       consumer.close();
       session.commit();
 
-      assertEquals("backup must be running with the same nodeID", liveId, backupServer.getServer().getNodeID());
+      Assert.assertEquals("backup must be running with the same nodeID", liveId, backupServer.getServer().getNodeID());
       sf.close();
 
       backupServer.crash();
       Thread.sleep(100);
-      assertFalse("backup is not running", backupServer.isStarted());
+      Assert.assertFalse("backup is not running", backupServer.isStarted());
 
-      assertFalse("must NOT be a backup", liveServer.getServer().getHAPolicy() instanceof BackupPolicy);
+      Assert.assertFalse("must NOT be a backup", liveServer.getServer().getHAPolicy() instanceof BackupPolicy);
       adaptLiveConfigForReplicatedFailBack(liveServer);
       beforeRestart(liveServer);
       liveServer.start();
-      assertTrue("live initialized...", liveServer.getServer().waitForActivation(15, TimeUnit.SECONDS));
+      Assert.assertTrue("live initialized...", liveServer.getServer().waitForActivation(15, TimeUnit.SECONDS));
 
       sf = (ClientSessionFactoryInternal) createSessionFactory(locator);
 
@@ -730,27 +730,27 @@ public class FailoverTest extends FailoverTestBase
       producer.close();
       session.commit();
 
-      assertEquals("backup must be running with the same nodeID", liveId, backupServer.getServer().getNodeID());
+      Assert.assertEquals("backup must be running with the same nodeID", liveId, backupServer.getServer().getNodeID());
       if (doFailBack)
       {
-         assertFalse("must NOT be a backup", liveServer.getServer().getHAPolicy().isBackup());
+         Assert.assertFalse("must NOT be a backup", liveServer.getServer().getHAPolicy().isBackup());
          adaptLiveConfigForReplicatedFailBack(liveServer);
          beforeRestart(liveServer);
          liveServer.start();
-         assertTrue("live initialized...", liveServer.getServer().waitForActivation(40, TimeUnit.SECONDS));
+         Assert.assertTrue("live initialized...", liveServer.getServer().waitForActivation(40, TimeUnit.SECONDS));
          int i = 0;
          while (backupServer.isStarted() && i++ < 100)
          {
             Thread.sleep(100);
          }
-         assertFalse("Backup should stop!", backupServer.isStarted());
+         Assert.assertFalse("Backup should stop!", backupServer.isStarted());
       }
       else
       {
          backupServer.stop();
          beforeRestart(backupServer);
          backupServer.start();
-         assertTrue(backupServer.getServer().waitForActivation(10, TimeUnit.SECONDS));
+         Assert.assertTrue(backupServer.getServer().waitForActivation(10, TimeUnit.SECONDS));
       }
 
       ClientSession session2 = createSession(sf, false, false);
@@ -763,12 +763,12 @@ public class FailoverTest extends FailoverTestBase
 
    /**
     * @param consumer
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    private void assertNoMoreMessages(ClientConsumer consumer) throws ActiveMQException
    {
       ClientMessage msg = consumer.receiveImmediate();
-      assertNull("there should be no more messages to receive! " + msg, msg);
+      Assert.assertNull("there should be no more messages to receive! " + msg, msg);
    }
 
    protected void createSessionFactory() throws Exception
@@ -802,7 +802,7 @@ public class FailoverTest extends FailoverTestBase
       for (int i = 0; i < numMessages; i++)
       {
          ClientMessage message = consumer.receive(1000);
-         assertNotNull("Just crashed? " + (i == 6) + " " + i, message);
+         Assert.assertNotNull("Just crashed? " + (i == 6) + " " + i, message);
 
          message.acknowledge();
 
@@ -818,7 +818,7 @@ public class FailoverTest extends FailoverTestBase
       try
       {
          session.commit();
-         fail("session must have rolled back on failover");
+         Assert.fail("session must have rolled back on failover");
       }
       catch (ActiveMQTransactionRolledBackException trbe)
       {
@@ -826,7 +826,7 @@ public class FailoverTest extends FailoverTestBase
       }
       catch (ActiveMQException e)
       {
-         fail("Invalid Exception type:" + e.getType());
+         Assert.fail("Invalid Exception type:" + e.getType());
       }
 
       consumer.close();
@@ -839,7 +839,7 @@ public class FailoverTest extends FailoverTestBase
       {
          ClientMessage message = consumer.receive(1000);
 
-         assertNotNull("Expecting message #" + i, message);
+         Assert.assertNotNull("Expecting message #" + i, message);
 
          message.acknowledge();
       }
@@ -920,7 +920,7 @@ public class FailoverTest extends FailoverTestBase
       }
       catch (ActiveMQException e)
       {
-         fail("Invalid Exception type:" + e.getType());
+         Assert.fail("Invalid Exception type:" + e.getType());
       }
 
       ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
@@ -965,7 +965,7 @@ public class FailoverTest extends FailoverTestBase
       }
       catch (ActiveMQException e)
       {
-         fail("Invalid Exception type:" + e.getType());
+         Assert.fail("Invalid Exception type:" + e.getType());
       }
 
       ClientMessage message = session.createMessage(false);
@@ -1101,7 +1101,7 @@ public class FailoverTest extends FailoverTestBase
       }
       catch (ActiveMQException e)
       {
-         fail("Invalid Exception type:" + e.getType());
+         Assert.fail("Invalid Exception type:" + e.getType());
       }
    }
 
@@ -1728,7 +1728,7 @@ public class FailoverTest extends FailoverTestBase
             if (msgInternalCounter == i + 1)
             {
                // The test can only jump to the next message if the current iteration is meant for non-durable
-               assertFalse("a message on counter=" + i + " was expected", isDurable(i));
+               Assert.assertFalse("a message on counter=" + i + " was expected", isDurable(i));
                // message belongs to the next iteration.. let's just ignore it
                repeatMessage = message;
                continue;
@@ -2007,7 +2007,7 @@ public class FailoverTest extends FailoverTestBase
       committer.start();
 
       // Wait for the commit to occur and the response to be discarded
-      assertTrue(committer.interceptor.await());
+      Assert.assertTrue(committer.interceptor.await());
 
       crash(session);
 
@@ -2044,7 +2044,7 @@ public class FailoverTest extends FailoverTestBase
       try
       {
          session2.commit();
-         fail("expecting DUPLICATE_ID_REJECTED exception");
+         Assert.fail("expecting DUPLICATE_ID_REJECTED exception");
       }
       catch (ActiveMQDuplicateIdException dide)
       {
@@ -2052,7 +2052,7 @@ public class FailoverTest extends FailoverTestBase
       }
       catch (ActiveMQException e)
       {
-         fail("Invalid Exception type:" + e.getType());
+         Assert.fail("Invalid Exception type:" + e.getType());
       }
 
       ClientConsumer consumer = session2.createConsumer(FailoverTestBase.ADDRESS);
@@ -2195,7 +2195,7 @@ public class FailoverTest extends FailoverTestBase
 
       backupServer.start();
 
-      assertTrue("session failure listener", listener.getLatch().await(5, TimeUnit.SECONDS));
+      Assert.assertTrue("session failure listener", listener.getLatch().await(5, TimeUnit.SECONDS));
 
       ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
 
@@ -2228,7 +2228,7 @@ public class FailoverTest extends FailoverTestBase
 
       liveServer.start();
 
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
+      Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
 
       ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
 
@@ -2260,7 +2260,7 @@ public class FailoverTest extends FailoverTestBase
 
       liveServer.start();
 
-      assertTrue(latch.await(5, TimeUnit.SECONDS));
+      Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
 
       ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
 
@@ -2284,7 +2284,7 @@ public class FailoverTest extends FailoverTestBase
 
       ClientMessage cm = cc.receive(5000);
 
-      assertNotNull(cm);
+      Assert.assertNotNull(cm);
 
       Assert.assertEquals("message0", cm.getBodyBuffer().readString());
    }
@@ -2320,7 +2320,7 @@ public class FailoverTest extends FailoverTestBase
 
       backupServer.start();
 
-      assertTrue("session failure listener", listener.getLatch().await(5, TimeUnit.SECONDS));
+      Assert.assertTrue("session failure listener", listener.getLatch().await(5, TimeUnit.SECONDS));
 
       ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
 
@@ -2344,7 +2344,7 @@ public class FailoverTest extends FailoverTestBase
 
       ClientMessage cm = cc.receive(5000);
 
-      assertNotNull(cm);
+      Assert.assertNotNull(cm);
 
       Assert.assertEquals("message0", cm.getBodyBuffer().readString());
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
index 36ad4def79..0b1aa0016d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -23,33 +23,33 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClusterTopologyListener;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.client.TopologyMember;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.core.config.ClusterConnectionConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnector;
-import org.apache.activemq.core.remoting.impl.invm.InVMRegistry;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.cluster.ha.ReplicatedPolicy;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.tests.integration.cluster.util.SameProcessActiveMQServer;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
-import org.apache.activemq.tests.util.ReplicatedBackupUtils;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.client.TopologyMember;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.tests.util.ReplicatedBackupUtils;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnector;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMRegistry;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.cluster.ha.ReplicatedPolicy;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.tests.integration.cluster.util.SameProcessActiveMQServer;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -240,8 +240,8 @@ public abstract class FailoverTestBase extends ServiceTestBase
       if (server.getServer().getHAPolicy().isSharedStore())
       {
          ClusterConnectionConfiguration cc = configuration.getClusterConfigurations().get(0);
-         assertNotNull("cluster connection configuration", cc);
-         assertNotNull("static connectors", cc.getStaticConnectors());
+         Assert.assertNotNull("cluster connection configuration", cc);
+         Assert.assertNotNull("static connectors", cc.getStaticConnectors());
          cc.getStaticConnectors().add(backupConnector.getName());
          // backupConnector is only necessary for fail-back tests
          configuration.getConnectorConfigurations().put(backupConnector.getName(), backupConnector);
@@ -298,7 +298,7 @@ public abstract class FailoverTestBase extends ServiceTestBase
       ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory();
       addSessionFactory(sf);
 
-      assertTrue("topology members expected " + topologyMembers, countDownLatch.await(5, TimeUnit.SECONDS));
+      Assert.assertTrue("topology members expected " + topologyMembers, countDownLatch.await(5, TimeUnit.SECONDS));
       return sf;
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java
index 1ed1855a86..2f217a4702 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class GroupingFailoverReplicationTest extends GroupingFailoverTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java
index 0690a5fc92..393cdd1c1d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class GroupingFailoverSharedServerTest extends GroupingFailoverTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverTestBase.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverTestBase.java
index 4bba1caf88..5c2b660d99 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/GroupingFailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverTestBase.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.TopologyMemberImpl;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration;
-import org.apache.activemq.core.server.impl.SharedNothingBackupActivation;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
+import org.apache.activemq.artemis.core.server.impl.SharedNothingBackupActivation;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Test;
 
 public abstract class GroupingFailoverTestBase extends ClusterTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/LargeMessageFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LargeMessageFailoverTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/LargeMessageFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LargeMessageFailoverTest.java
index 18422092ea..ff757f53d5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/LargeMessageFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LargeMessageFailoverTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
 import org.junit.Test;
 
 public class LargeMessageFailoverTest extends FailoverTest
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/LiveToLiveFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LiveToLiveFailoverTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/LiveToLiveFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LiveToLiveFailoverTest.java
index dd21cdb3e4..16647e9b10 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/LiveToLiveFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LiveToLiveFailoverTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.config.ScaleDownConfiguration;
-import org.apache.activemq.core.config.ha.ColocatedPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.config.ScaleDownConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ColocatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -153,7 +153,7 @@ public class LiveToLiveFailoverTest extends FailoverTest
          sf2 = (ClientSessionFactoryInternal) locator.createSessionFactory(backupServer.getServer().getNodeID().toString());
 
          ClientSession session2 = createSession(sf2, false, false);
-         session2.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
+         session2.createQueue(ADDRESS, ADDRESS, null, true);
          addSessionFactory(sf2);
       }
 
@@ -182,7 +182,7 @@ public class LiveToLiveFailoverTest extends FailoverTest
          sf2 = (ClientSessionFactoryInternal) locator.createSessionFactory(backupServer.getServer().getNodeID().toString());
 
          ClientSession session2 = createSession(sf2, false, false);
-         session2.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
+         session2.createQueue(ADDRESS, ADDRESS, null, true);
          addSessionFactory(sf2);
       }
       return sf;
@@ -214,7 +214,7 @@ public class LiveToLiveFailoverTest extends FailoverTest
          sf2 = (ClientSessionFactoryInternal) locator.createSessionFactory(backupServer.getServer().getNodeID().toString());
          addSessionFactory(sf2);
          ClientSession session2 = createSession(sf2, false, false);
-         session2.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
+         session2.createQueue(ADDRESS, ADDRESS, null, true);
       }
    }
 
@@ -235,16 +235,16 @@ public class LiveToLiveFailoverTest extends FailoverTest
 
       ClientSession session = createSession(sf, true, true);
 
-      session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
+      session.createQueue(ADDRESS, ADDRESS, null, true);
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
       //send enough messages to ensure that when the client fails over scaledown hasn't complete
       sendMessages(session, producer, 1000);
 
       crash(session);
 
-      ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
+      ClientConsumer consumer = session.createConsumer(ADDRESS);
 
       session.start();
 
@@ -277,12 +277,12 @@ public class LiveToLiveFailoverTest extends FailoverTest
 
       //session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
 
       sendMessages(session, producer, NUM_MESSAGES);
 
-      ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
+      ClientConsumer consumer = session.createConsumer(ADDRESS);
 
       session.start();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java
similarity index 79%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java
index 8420b8a591..a9449dc3db 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java
@@ -14,27 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.cluster.failover.FailoverTestBase.LatchClusterTopologyListener;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
 import org.junit.Assert;
 
 public abstract class MultipleBackupsFailoverTestBase extends ServiceTestBase
@@ -86,7 +85,7 @@ public abstract class MultipleBackupsFailoverTestBase extends ServiceTestBase
          }
          if (System.currentTimeMillis() > (time + toWait))
          {
-            fail("backup server never started");
+            Assert.fail("backup server never started");
          }
       }
    }
@@ -124,7 +123,7 @@ public abstract class MultipleBackupsFailoverTestBase extends ServiceTestBase
       {
          ClientMessage message2 = consumer.receive(10000);
 
-         assertNotNull(message2);
+         Assert.assertNotNull(message2);
 
          Assert.assertEquals("aardvarks", message2.getBodyBuffer().readString());
 
@@ -153,7 +152,7 @@ public abstract class MultipleBackupsFailoverTestBase extends ServiceTestBase
       ClientSessionFactoryInternal sf;
       CountDownLatch countDownLatch = new CountDownLatch(topologyMembers);
 
-      LatchClusterTopologyListener topListener = new LatchClusterTopologyListener(countDownLatch);
+      FailoverTestBase.LatchClusterTopologyListener topListener = new FailoverTestBase.LatchClusterTopologyListener(countDownLatch);
       locator.addClusterTopologyListener(topListener);
 
       sf = (ClientSessionFactoryInternal)locator.createSessionFactory();
@@ -168,7 +167,7 @@ public abstract class MultipleBackupsFailoverTestBase extends ServiceTestBase
             log.info("failed topology, Topology on server = " + server.getClusterManager().describe());
          }
       }
-      assertTrue("expected " + topologyMembers + " members", ok);
+      Assert.assertTrue("expected " + topologyMembers + " members", ok);
       return sf;
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
index cd51987680..d60da9cca9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
@@ -14,28 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.tests.integration.cluster.util.SameProcessActiveMQServer;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.tests.integration.cluster.util.SameProcessActiveMQServer;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
index 1e37801fc7..86c1b9b16a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
@@ -14,32 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.HAPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServerLogger;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.integration.cluster.util.SameProcessActiveMQServer;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.tests.integration.cluster.util.SameProcessActiveMQServer;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java
index c15a0f11b7..55e5ae29fa 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
 
 public class NettyAsynchronousFailoverTest extends AsynchronousFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java
similarity index 78%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java
index ef8359f439..7d2b087e4f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 
 public class NettyAsynchronousReattachTest extends NettyAsynchronousFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java
index c096a4417e..a84bbbec86 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class NettyDiscoveryClusterWithBackupFailoverTest extends DiscoveryClusterWithBackupFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTest.java
similarity index 74%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTest.java
index 3178b5e084..462df67bb2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import org.junit.Test;
 
@@ -23,14 +23,14 @@ import java.util.Map;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
 
 public class NettyFailoverTest extends FailoverTest
 {
@@ -63,13 +63,13 @@ public class NettyFailoverTest extends FailoverTest
 
       ClientSession session = createSession(sf, true, true, 0);
 
-      session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
+      session.createQueue(ADDRESS, ADDRESS, null, true);
 
-      ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
+      ClientProducer producer = session.createProducer(ADDRESS);
 
       final int numMessages = 10;
 
-      ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
+      ClientConsumer consumer = session.createConsumer(ADDRESS);
 
       session.start();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java
index eb89e4e4d6..6ac3110112 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class NettyFileStorageDiscoveryClusterWithBackupFailoverTest extends DiscoveryClusterWithBackupFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java
index d15293c5f4..983aeb4144 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class NettyFileStorageStaticClusterWithBackupFailoverTest extends StaticClusterWithBackupFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
index 94d079cc84..e247c10704 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.tests.integration.cluster.util.SameProcessActiveMQServer;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.tests.integration.cluster.util.SameProcessActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
 
 public class NettyReplicatedFailoverTest extends NettyFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java
index 35eff51581..4dcdfc6784 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class NettyStaticClusterWithBackupFailoverTest extends StaticClusterWithBackupFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/PagingFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PagingFailoverTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/PagingFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PagingFailoverTest.java
index cb1f17c769..9d9c52ebbb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/PagingFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PagingFailoverTest.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.HashMap;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.cluster.util.SameProcessActiveMQServer;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.cluster.util.SameProcessActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -228,7 +228,7 @@ public class PagingFailoverTest extends FailoverTestBase
          queue.expireReferences();
       }
 
-      assertFalse(queue.getPageSubscription().isPaging());
+      Assert.assertFalse(queue.getPageSubscription().isPaging());
 
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/QuorumFailOverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumFailOverTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/QuorumFailOverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumFailOverTest.java
index 8f819c6ae9..03f8417a96 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/QuorumFailOverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumFailOverTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.Pair;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClusterTopologyListener;
-import org.apache.activemq.api.core.client.TopologyMember;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.tests.integration.cluster.util.BackupSyncDelay;
+import org.apache.activemq.artemis.api.core.Pair;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener;
+import org.apache.activemq.artemis.api.core.client.TopologyMember;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.tests.integration.cluster.util.BackupSyncDelay;
 import org.junit.Test;
 
 public class QuorumFailOverTest extends StaticClusterWithBackupFailoverTest
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java
index 888ef00f89..d6631ec514 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 
-import org.apache.activemq.core.server.cluster.qourum.BooleanVote;
-import org.apache.activemq.core.server.cluster.qourum.QuorumVoteServerConnect;
-import org.apache.activemq.tests.integration.server.FakeStorageManager;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.server.cluster.qourum.BooleanVote;
+import org.apache.activemq.artemis.core.server.cluster.qourum.QuorumVoteServerConnect;
+import org.apache.activemq.artemis.tests.integration.server.FakeStorageManager;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java
index 4e4e539c60..522d884bb9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class ReplicatedAsynchronousFailoverTest extends AsynchronousFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedDistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedDistributionTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedDistributionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedDistributionTest.java
index 8dd9ce8ee1..45d279b31d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedDistributionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedDistributionTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
-import org.apache.activemq.tests.util.CountDownSessionFailureListener;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.tests.util.CountDownSessionFailureListener;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java
index 8596db3c38..200a0dbb49 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.server.cluster.ha.ReplicatedPolicy;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.server.cluster.ha.ReplicatedPolicy;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
@@ -61,7 +61,7 @@ public class ReplicatedFailoverTest extends FailoverTest
 
          ClientSession session = createSession(sf, true, true);
 
-         session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
+         session.createQueue(ADDRESS, ADDRESS, null, true);
 
          crash(session);
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java
index c5912ca6ac..68e1b9a170 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
 
 public class ReplicatedFailoverUsingNodeGroupNameTest extends ReplicatedFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java
index 0c1d755210..be6d0be619 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
 
 public class ReplicatedLargeMessageFailoverTest extends LargeMessageFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
index cdbf4afe57..e3485602be 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.tests.integration.cluster.util.BackupSyncDelay;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.tests.integration.cluster.util.BackupSyncDelay;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java
index b2b8672e56..a33b2b124e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest extends ReplicatedManyMultipleServerFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java
index ebd941f904..423cf452a7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class ReplicatedManyMultipleServerFailoverTest extends ReplicatedMultipleServerFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java
similarity index 77%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java
index c2a9894b6e..c30451b45c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java
@@ -14,20 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
-import org.junit.Assert;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
 import org.junit.Test;
 
 public class ReplicatedMultipleServerFailoverExtraBackupsTest extends ReplicatedMultipleServerFailoverTest
@@ -91,7 +90,7 @@ public class ReplicatedMultipleServerFailoverExtraBackupsTest extends Replicated
       ClientSession session0 = factory0.createSession(false, true, true);
       ClientSession session1 = factory1.createSession(false, true, true);
 
-      ClientProducer producer = session0.createProducer(MultipleServerFailoverTestBase.ADDRESS);
+      ClientProducer producer = session0.createProducer(ADDRESS);
 
       for (int i = 0; i < 200; i++)
       {
@@ -106,8 +105,8 @@ public class ReplicatedMultipleServerFailoverExtraBackupsTest extends Replicated
 
       producer.close();
 
-      waitForDistribution(MultipleServerFailoverTestBase.ADDRESS, backupServers.get(0).getServer(), 100);
-      waitForDistribution(MultipleServerFailoverTestBase.ADDRESS, backupServers.get(1).getServer(), 100);
+      waitForDistribution(ADDRESS, backupServers.get(0).getServer(), 100);
+      waitForDistribution(ADDRESS, backupServers.get(1).getServer(), 100);
 
       List toCrash = new ArrayList();
       for (TestableServer backupServer : backupServers)
@@ -123,8 +122,8 @@ public class ReplicatedMultipleServerFailoverExtraBackupsTest extends Replicated
          testableServer.crash();
       }
 
-      ClientConsumer consumer0 = session0.createConsumer(MultipleServerFailoverTestBase.ADDRESS);
-      ClientConsumer consumer1 = session1.createConsumer(MultipleServerFailoverTestBase.ADDRESS);
+      ClientConsumer consumer0 = session0.createConsumer(ADDRESS);
+      ClientConsumer consumer1 = session1.createConsumer(ADDRESS);
       session0.start();
       session1.start();
 
@@ -132,10 +131,10 @@ public class ReplicatedMultipleServerFailoverExtraBackupsTest extends Replicated
       for (int i = 0; i < 100; i++)
       {
          ClientMessage message = consumer0.receive(1000);
-         Assert.assertNotNull("expecting durable msg " + i, message);
+         assertNotNull("expecting durable msg " + i, message);
          message.acknowledge();
          consumer1.receive(1000);
-         Assert.assertNotNull("expecting durable msg " + i, message);
+         assertNotNull("expecting durable msg " + i, message);
          message.acknowledge();
 
       }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java
index 5be5c21883..204032e1cd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class ReplicatedMultipleServerFailoverNoGroupNodeNameTest extends ReplicatedMultipleServerFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java
index 7f0441de98..f49fde9317 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java
@@ -14,16 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
-import org.junit.Assert;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
 import org.junit.Test;
 
 public class ReplicatedMultipleServerFailoverTest extends MultipleServerFailoverTestBase
@@ -78,7 +77,7 @@ public class ReplicatedMultipleServerFailoverTest extends MultipleServerFailover
          for (int i = 0; i < factories.length; i++)
          {
             sessions[i] = createSession(factories[i], true, true);
-            sessions[i].createQueue(MultipleServerFailoverTestBase.ADDRESS, MultipleServerFailoverTestBase.ADDRESS, null, true);
+            sessions[i].createQueue(ADDRESS, ADDRESS, null, true);
          }
 
          //make sure bindings are ready before sending messages
@@ -88,7 +87,7 @@ public class ReplicatedMultipleServerFailoverTest extends MultipleServerFailover
             this.waitForBindings(liveServers.get(i).getServer(), ADDRESS.toString(), false, 1, 0, 2000);
          }
 
-         ClientProducer producer = sessions[0].createProducer(MultipleServerFailoverTestBase.ADDRESS);
+         ClientProducer producer = sessions[0].createProducer(ADDRESS);
 
          for (int i = 0; i < liveServers.size() * 100; i++)
          {
@@ -105,7 +104,7 @@ public class ReplicatedMultipleServerFailoverTest extends MultipleServerFailover
 
          for (TestableServer liveServer : liveServers)
          {
-            waitForDistribution(MultipleServerFailoverTestBase.ADDRESS, liveServer.getServer(), 100);
+            waitForDistribution(ADDRESS, liveServer.getServer(), 100);
          }
 
 
@@ -116,7 +115,7 @@ public class ReplicatedMultipleServerFailoverTest extends MultipleServerFailover
          ClientConsumer[] consumers = new ClientConsumer[liveServers.size()];
          for (int i = 0; i < factories.length; i++)
          {
-            consumers[i] = sessions[i].createConsumer(MultipleServerFailoverTestBase.ADDRESS);
+            consumers[i] = sessions[i].createConsumer(ADDRESS);
             sessions[i].start();
          }
 
@@ -125,7 +124,7 @@ public class ReplicatedMultipleServerFailoverTest extends MultipleServerFailover
             for (ClientConsumer consumer : consumers)
             {
                ClientMessage message = consumer.receive(1000);
-               Assert.assertNotNull("expecting durable msg " + i, message);
+               assertNotNull("expecting durable msg " + i, message);
                message.acknowledge();
             }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java
index e370c2a807..6c0575daea 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class ReplicatedNettyAsynchronousFailoverTest extends NettyAsynchronousFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java
index b74876ff48..1ec5b3d4dc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import org.junit.Test;
 
 import java.util.HashMap;
 
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 
 public class ReplicatedPagedFailoverTest extends ReplicatedFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java
index aabacefe32..ea3adb74eb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class ReplicatedPagingFailoverTest extends PagingFailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java
index 375b6b22fb..e4dee69ec6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
+import org.apache.activemq.artemis.tests.integration.cluster.util.BackupSyncDelay;
 import org.junit.Before;
 
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.tests.integration.cluster.util.BackupSyncDelay;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
 
 /**
  * See {@link BackupSyncDelay} for the rationale about these 'WithDelay' tests.
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SecurityFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SecurityFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java
index f88e7c1f1a..6803d31811 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SecurityFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
 
 public class SecurityFailoverTest extends FailoverTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SharedStoreDistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SharedStoreDistributionTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SharedStoreDistributionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SharedStoreDistributionTest.java
index 9062f7b241..2c12125a0a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SharedStoreDistributionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SharedStoreDistributionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class SharedStoreDistributionTest extends ReplicatedDistributionTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
index 4a134fbfb7..2de81b626d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
@@ -14,28 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorImpl;
-import org.apache.activemq.core.client.impl.Topology;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.cluster.util.SameProcessActiveMQServer;
-import org.apache.activemq.tests.integration.cluster.util.TestableServer;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
+import org.apache.activemq.artemis.core.client.impl.Topology;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.cluster.util.SameProcessActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java
index e4660d18e4..713ca895e6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover;
+package org.apache.activemq.artemis.tests.integration.cluster.failover;
 
 public class StaticClusterWithBackupFailoverTest extends ClusterWithBackupFailoverTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java
similarity index 69%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java
index 1f89c9ceb1..b01fd1b1a9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.failover.remote;
+package org.apache.activemq.artemis.tests.integration.cluster.failover.remote;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
 import org.junit.Test;
 
 public class FailoverWithSharedStoreTest extends ClusterTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java
index ef54c3924f..77ef14244c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.ha;
+package org.apache.activemq.artemis.tests.integration.cluster.ha;
 
-import org.apache.activemq.core.config.HAPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ColocatedPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ColocatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java
index fc95db8a2e..edeebac5cf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.reattach;
+package org.apache.activemq.artemis.tests.integration.cluster.reattach;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.core.config.Configuration;
 
 /**
  *
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
index e180847dbf..c23177b22d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
@@ -14,8 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.reattach;
-import org.apache.activemq.api.core.ActiveMQException;
+package org.apache.activemq.artemis.tests.integration.cluster.reattach;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -30,20 +32,19 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.remoting.impl.invm.InVMRegistry;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.client.ActiveMQBytesMessage;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMRegistry;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.client.ActiveMQBytesMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReattachSupportTestBase
 {
@@ -1276,7 +1277,7 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
    @After
    public void tearDown() throws Exception
    {
-      stopComponent(liveServer);
+      UnitTestCase.stopComponent(liveServer);
 
       liveServer = null;
 
@@ -1316,7 +1317,7 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
    @Override
    protected void stop() throws Exception
    {
-      stopComponent(liveServer);
+      UnitTestCase.stopComponent(liveServer);
 
       System.gc();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
index 5ad2ad43b1..7c5ac0a56e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.reattach;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
+package org.apache.activemq.artemis.tests.integration.cluster.reattach;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
 import org.junit.Before;
 import org.junit.After;
 
@@ -26,16 +26,16 @@ import java.util.TimerTask;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.protocol.core.impl.RemotingConnectionImpl;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnector;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.protocol.core.impl.RemotingConnectionImpl;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnector;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 
 public abstract class MultiThreadReattachSupportTestBase extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java
index b235855074..65fe58b0b4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.reattach;
+package org.apache.activemq.artemis.tests.integration.cluster.reattach;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
 
 public class NettyMultiThreadRandomReattachTest extends MultiThreadRandomReattachTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/OrderReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/OrderReattachTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
index 6017f573d8..8883fe5847 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/OrderReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.reattach;
+package org.apache.activemq.artemis.tests.integration.cluster.reattach;
 
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
 import org.junit.Test;
 
 import java.util.HashSet;
@@ -27,20 +27,20 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.protocol.core.impl.RemotingConnectionImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.protocol.core.impl.RemotingConnectionImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class OrderReattachTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/RandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/RandomReattachTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
index 01b6f8afad..18acd0787b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/RandomReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.reattach;
+package org.apache.activemq.artemis.tests.integration.cluster.reattach;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -24,28 +24,28 @@ import java.util.TimerTask;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMRegistry;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMRegistry;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -1496,7 +1496,7 @@ public class RandomReattachTest extends UnitTestCase
    {
       Configuration liveConf = createDefaultConfig()
          .setSecurityEnabled(false)
-         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory"));
+         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory"));
       liveService = ActiveMQServers.newActiveMQServer(liveConf, false);
       liveService.start();
    }
@@ -1564,7 +1564,7 @@ public class RandomReattachTest extends UnitTestCase
       private final ArrayList errors = new ArrayList();
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.api.core.client.MessageHandler#onMessage(org.apache.activemq.api.core.client.ClientMessage)
+       * @see MessageHandler#onMessage(ClientMessage)
        */
       public void onMessage(ClientMessage message)
       {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/ReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/ReattachTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
index 5d0bb8f4ce..4182a0a1f4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/ReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
@@ -14,36 +14,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.reattach;
+package org.apache.activemq.artemis.tests.integration.cluster.reattach;
 
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.ActiveMQObjectClosedException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.client.SessionFailureListener;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnector;
-import org.apache.activemq.core.remoting.impl.invm.InVMRegistry;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnector;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMRegistry;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/restart/ClusterRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/restart/ClusterRestartTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/restart/ClusterRestartTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/restart/ClusterRestartTest.java
index 482cb09004..d08bcb3195 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/restart/ClusterRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/restart/ClusterRestartTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.restart;
+package org.apache.activemq.artemis.tests.integration.cluster.restart;
 
 import org.junit.Test;
 
 import java.util.Collection;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
 
 public class ClusterRestartTest extends ClusterTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/HAClientTopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/HAClientTopologyTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyTest.java
index d9f429bb10..0ad26c4919 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/HAClientTopologyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyTest.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.topology;
+package org.apache.activemq.artemis.tests.integration.cluster.topology;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class HAClientTopologyTest extends TopologyClusterTestBase
 {
@@ -56,7 +57,7 @@ public class HAClientTopologyTest extends TopologyClusterTestBase
    @Override
    protected ServerLocator createHAServerLocator()
    {
-      TransportConfiguration tc = createTransportConfiguration(isNetty(), false, generateParams(0, isNetty()));
+      TransportConfiguration tc = ServiceTestBase.createTransportConfiguration(isNetty(), false, ServiceTestBase.generateParams(0, isNetty()));
       ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocatorWithHA(tc));
       locator.setBlockOnNonDurableSend(true);
       locator.setBlockOnDurableSend(true);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java
index 72f3fbc811..910fe07671 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.topology;
+package org.apache.activemq.artemis.tests.integration.cluster.topology;
 
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
 
 public class HAClientTopologyWithDiscoveryTest extends TopologyClusterTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/IsolatedTopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/IsolatedTopologyTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/IsolatedTopologyTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/IsolatedTopologyTest.java
index 1c8fa1e103..ba2b163c6b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/IsolatedTopologyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/IsolatedTopologyTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.topology;
+package org.apache.activemq.artemis.tests.integration.cluster.topology;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.client.impl.Topology;
-import org.apache.activemq.core.client.impl.TopologyMemberImpl;
-import org.apache.activemq.core.config.ClusterConnectionConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.Topology;
+import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl;
+import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -107,7 +107,7 @@ public class IsolatedTopologyTest extends ServiceTestBase
    {
       Map params = new HashMap();
       params.put(TransportConstants.CLUSTER_CONNECTION, "cc1");
-      params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "1");
+      params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "1");
 
       TransportConfiguration acceptor1VM1 = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY,
                                                                        params,
@@ -115,7 +115,7 @@ public class IsolatedTopologyTest extends ServiceTestBase
 
       params = new HashMap();
       params.put(TransportConstants.CLUSTER_CONNECTION, "cc2");
-      params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "2");
+      params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "2");
 
       TransportConfiguration acceptor2VM1 = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY,
                                                                        params,
@@ -164,7 +164,7 @@ public class IsolatedTopologyTest extends ServiceTestBase
 
       Map params = new HashMap();
       params.put(TransportConstants.CLUSTER_CONNECTION, "cc1");
-      params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "3");
+      params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "3");
 
       TransportConfiguration acceptor1VM1 = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY,
                                                                        params,
@@ -172,7 +172,7 @@ public class IsolatedTopologyTest extends ServiceTestBase
 
       params = new HashMap();
       params.put(TransportConstants.CLUSTER_CONNECTION, "cc2");
-      params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "4");
+      params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "4");
 
       TransportConfiguration acceptor2VM1 = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY,
                                                                        params,
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NettyHAClientTopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NettyHAClientTopologyTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NettyHAClientTopologyTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NettyHAClientTopologyTest.java
index c6cc7fedd0..2fe04aadd9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NettyHAClientTopologyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NettyHAClientTopologyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.topology;
+package org.apache.activemq.artemis.tests.integration.cluster.topology;
 
 public class NettyHAClientTopologyTest extends HAClientTopologyTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java
index 86647465e2..3a0f9b7aba 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.topology;
+package org.apache.activemq.artemis.tests.integration.cluster.topology;
 
 public class NettyHAClientTopologyWithDiscoveryTest extends HAClientTopologyWithDiscoveryTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NonHATopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NonHATopologyTest.java
similarity index 80%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NonHATopologyTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NonHATopologyTest.java
index ad23fb4a23..df305f6ac9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/NonHATopologyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NonHATopologyTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.topology;
+package org.apache.activemq.artemis.tests.integration.cluster.topology;
 
 import org.junit.Test;
 
 import java.util.ArrayList;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.core.client.impl.ServerLocatorInternal;
-import org.apache.activemq.core.client.impl.Topology;
-import org.apache.activemq.core.client.impl.TopologyMemberImpl;
-import org.apache.activemq.core.config.ClusterConnectionConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
+import org.apache.activemq.artemis.core.client.impl.Topology;
+import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl;
+import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 /**
  * I have added this test to help validate if the connectors from Recovery will be
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/TopologyClusterTestBase.java
similarity index 79%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/TopologyClusterTestBase.java
index 396720ba89..6388083462 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/TopologyClusterTestBase.java
@@ -14,32 +14,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.topology;
+package org.apache.activemq.artemis.tests.integration.cluster.topology;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQObjectClosedException;
-import org.apache.activemq.api.core.ActiveMQUnBlockedException;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ClusterTopologyListener;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.client.TopologyMember;
-import org.apache.activemq.core.client.impl.ServerLocatorImpl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.cluster.ClusterConnection;
-import org.apache.activemq.core.server.cluster.ClusterManager;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
+import org.apache.activemq.artemis.api.core.ActiveMQUnBlockedException;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.client.TopologyMember;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.cluster.ClusterConnection;
+import org.apache.activemq.artemis.core.server.cluster.ClusterManager;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -126,10 +128,10 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
     */
    protected void checkOrder(int[] expected, String[] nodeIDs, List actual)
    {
-      assertEquals(expected.length, actual.size());
+      Assert.assertEquals(expected.length, actual.size());
       for (int i = 0; i < expected.length; i++)
       {
-         assertEquals("did not receive expected nodeID at " + i, nodeIDs[expected[i]], actual.get(i));
+         Assert.assertEquals("did not receive expected nodeID at " + i, nodeIDs[expected[i]], actual.get(i));
       }
    }
 
@@ -152,7 +154,7 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
             return;
          }
       } while (System.currentTimeMillis() - start < 5000);
-      fail("did not contain all expected node ID: " + actual);
+      Assert.fail("did not contain all expected node ID: " + actual);
    }
 
    protected String[] getNodeIDs(int... nodes)
@@ -223,10 +225,10 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
 
          Thread.sleep(10);
       }
-      while (System.currentTimeMillis() - start < WAIT_TIMEOUT);
+      while (System.currentTimeMillis() - start < ServiceTestBase.WAIT_TIMEOUT);
 
       log.error(clusterDescription(servers[node]));
-      assertEquals("Timed out waiting for cluster connections for server " + node, expected, nodesCount);
+      Assert.assertEquals("Timed out waiting for cluster connections for server " + node, expected, nodesCount);
    }
 
 
@@ -250,7 +252,7 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
       startServers(1, 4, 3, 2);
       String[] nodeIDs = getNodeIDs(0, 1, 2, 3, 4);
 
-      assertTrue("Was not notified that all servers are UP", upLatch.await(10, SECONDS));
+      Assert.assertTrue("Was not notified that all servers are UP", upLatch.await(10, SECONDS));
       checkContains(new int[]{0, 1, 4, 3, 2}, nodeIDs, nodes);
 
       waitForClusterConnections(0, 4);
@@ -261,7 +263,7 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
 
       stopServers(2, 3, 1, 4);
 
-      assertTrue("Was not notified that all servers are DOWN", downLatch.await(10, SECONDS));
+      Assert.assertTrue("Was not notified that all servers are DOWN", downLatch.await(10, SECONDS));
       checkContains(new int[]{0}, nodeIDs, nodes);
 
       sf.close();
@@ -294,7 +296,7 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
 
       ClientSessionFactory sf = createSessionFactory(locator);
 
-      assertTrue("Was not notified that all servers are UP", upLatch.await(10, SECONDS));
+      Assert.assertTrue("Was not notified that all servers are UP", upLatch.await(10, SECONDS));
       checkContains(new int[]{0, 1, 2, 3, 4}, nodeIDs, nodes);
 
       ClientSession session = sf.createSession();
@@ -317,7 +319,7 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
 
       stopServers(1);
 
-      assertTrue("Was not notified that all servers are DOWN", downLatch.await(10, SECONDS));
+      Assert.assertTrue("Was not notified that all servers are DOWN", downLatch.await(10, SECONDS));
       checkContains(new int[]{}, nodeIDs, nodes);
 
       sf.close();
@@ -344,42 +346,42 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
       locator.addClusterTopologyListener(new LatchListener(upLatch, nodes, new CountDownLatch(0)));
       ClientSessionFactory sf = createSessionFactory(locator);
 
-      assertTrue("Was not notified that all servers are UP", upLatch.await(10, SECONDS));
+      Assert.assertTrue("Was not notified that all servers are UP", upLatch.await(10, SECONDS));
       checkContains(new int[]{0, 1, 2, 3, 4}, nodeIDs, nodes);
 
       ClientSession session = sf.createSession();
 
       stopServers(0);
-      assertFalse(servers[0].isStarted());
+      Assert.assertFalse(servers[0].isStarted());
       session = checkSessionOrReconnect(session, locator);
       checkContains(new int[]{1, 2, 3, 4}, nodeIDs, nodes);
 
       stopServers(2);
-      assertFalse(servers[2].isStarted());
+      Assert.assertFalse(servers[2].isStarted());
       session = checkSessionOrReconnect(session, locator);
       checkContains(new int[]{1, 3, 4}, nodeIDs, nodes);
 
       stopServers(4);
-      assertFalse(servers[4].isStarted());
+      Assert.assertFalse(servers[4].isStarted());
       session = checkSessionOrReconnect(session, locator);
       checkContains(new int[]{1, 3}, nodeIDs, nodes);
 
       stopServers(3);
-      assertFalse(servers[3].isStarted());
+      Assert.assertFalse(servers[3].isStarted());
 
       session = checkSessionOrReconnect(session, locator);
       checkContains(new int[]{1}, nodeIDs, nodes);
 
       stopServers(1);
-      assertFalse(servers[1].isStarted());
+      Assert.assertFalse(servers[1].isStarted());
       try
       {
          session = checkSessionOrReconnect(session, locator);
-         fail();
+         Assert.fail();
       }
       catch (ActiveMQException expected)
       {
-         assertEquals(ActiveMQExceptionType.NOT_CONNECTED, expected.getType());
+         Assert.assertEquals(ActiveMQExceptionType.NOT_CONNECTED, expected.getType());
       }
    }
 
@@ -394,7 +396,7 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
             s.getConfiguration().setSecurityEnabled(true);
          }
       }
-      assertEquals(CLUSTER_PASSWORD, config.getClusterPassword());
+      Assert.assertEquals(UnitTestCase.CLUSTER_PASSWORD, config.getClusterPassword());
       config.setClusterPassword(config.getClusterPassword() + "-1-2-3-");
       startServers(0, 1, 2, 4, 3);
       int n = 0;
@@ -410,7 +412,7 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
       final String address = "foo1235";
       ServerLocator locator = createNonHALocator(isNetty());
       ClientSessionFactory sf = createSessionFactory(locator);
-      ClientSession session = sf.createSession(config.getClusterUser(), CLUSTER_PASSWORD, false, true, true, false, 1);
+      ClientSession session = sf.createSession(config.getClusterUser(), UnitTestCase.CLUSTER_PASSWORD, false, true, true, false, 1);
       session.createQueue(address, address, true);
       ClientProducer producer = session.createProducer(address);
       sendMessages(session, producer, 100);
@@ -446,7 +448,7 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
          locator.createSessionFactory(),
          locator.createSessionFactory(),
          locator.createSessionFactory()};
-      assertTrue("Was not notified that all servers are UP", upLatch.await(10, SECONDS));
+      Assert.assertTrue("Was not notified that all servers are UP", upLatch.await(10, SECONDS));
       checkContains(new int[]{0, 1, 2, 3, 4}, nodeIDs, nodes);
 
       // we can't close all of the servers, we need to leave one up to notify us
@@ -457,7 +459,7 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
       {
          log.warn("TopologyClusterTestBase.testMultipleClientSessionFactories will fail");
       }
-      assertTrue("Was not notified that all servers are Down", ok);
+      Assert.assertTrue("Was not notified that all servers are Down", ok);
       checkContains(new int[]{0}, nodeIDs, nodes);
 
       for (ClientSessionFactory sf : sfs)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/BackupSyncDelay.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/BackupSyncDelay.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java
index 710c4d3658..c031a88da1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/BackupSyncDelay.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.util;
+package org.apache.activemq.artemis.tests.integration.cluster.util;
 
 import java.util.concurrent.locks.Lock;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.core.protocol.core.Channel;
-import org.apache.activemq.core.protocol.core.ChannelHandler;
-import org.apache.activemq.core.protocol.core.CommandConfirmationHandler;
-import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationResponseMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage;
-import org.apache.activemq.core.replication.ReplicationEndpoint;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.impl.SharedNothingBackupActivation;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.core.protocol.core.Channel;
+import org.apache.activemq.artemis.core.protocol.core.ChannelHandler;
+import org.apache.activemq.artemis.core.protocol.core.CommandConfirmationHandler;
+import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationResponseMessage;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage;
+import org.apache.activemq.artemis.core.replication.ReplicationEndpoint;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.SharedNothingBackupActivation;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 /**
  * An interceptor to keep a replicated backup server from reaching "up-to-date" status.
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/MultiServerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/MultiServerTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java
index 70c905febc..1b20beea7b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/MultiServerTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.util;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
+package org.apache.activemq.artemis.tests.integration.cluster.util;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
 import org.junit.Before;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.Pair;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.ClusterConnectionConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.Pair;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
 
 public class MultiServerTestBase extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/RemoteServerConfiguration.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/RemoteServerConfiguration.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/RemoteServerConfiguration.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/RemoteServerConfiguration.java
index 04ad7fcb1b..d83da188e5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/RemoteServerConfiguration.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/RemoteServerConfiguration.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.util;
+package org.apache.activemq.artemis.tests.integration.cluster.util;
 
-import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.Configuration;
 
 /**
  * A RemoteServerConfiguration.
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/SameProcessActiveMQServer.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/SameProcessActiveMQServer.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/SameProcessActiveMQServer.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/SameProcessActiveMQServer.java
index 727b182c75..3beac1cace 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/SameProcessActiveMQServer.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/SameProcessActiveMQServer.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.util;
+package org.apache.activemq.artemis.tests.integration.cluster.util;
 
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.cluster.ClusterManager;
-import org.apache.activemq.tests.util.CountDownSessionFailureListener;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.tests.util.CountDownSessionFailureListener;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.cluster.ClusterManager;
 import org.junit.Assert;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/TestableServer.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/TestableServer.java
similarity index 80%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/TestableServer.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/TestableServer.java
index 352d7ec31c..351f82c713 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/TestableServer.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/TestableServer.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.cluster.util;
+package org.apache.activemq.artemis.tests.integration.cluster.util;
 
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.server.ActiveMQComponent;
-import org.apache.activemq.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 
 public interface TestableServer extends ActiveMQComponent
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryBaseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryBaseTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java
index ea0775bf86..bf610a3973 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryBaseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.discovery;
+package org.apache.activemq.artemis.tests.integration.discovery;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
@@ -24,19 +24,19 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.core.cluster.DiscoveryEntry;
-import org.apache.activemq.core.cluster.DiscoveryGroup;
-import org.apache.activemq.core.cluster.DiscoveryListener;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.cluster.BroadcastGroup;
-import org.apache.activemq.core.server.cluster.impl.BroadcastGroupImpl;
-import org.apache.activemq.core.server.management.NotificationService;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.cluster.DiscoveryEntry;
+import org.apache.activemq.artemis.core.cluster.DiscoveryGroup;
+import org.apache.activemq.artemis.core.cluster.DiscoveryListener;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.cluster.BroadcastGroup;
+import org.apache.activemq.artemis.core.server.cluster.impl.BroadcastGroupImpl;
+import org.apache.activemq.artemis.core.server.management.NotificationService;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.junit.Assert;
 
 public class DiscoveryBaseTest extends UnitTestCase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryStayAliveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryStayAliveTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryStayAliveTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryStayAliveTest.java
index 3c50eee5a6..93dae9e430 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryStayAliveTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryStayAliveTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.discovery;
+package org.apache.activemq.artemis.tests.integration.discovery;
 
 import java.net.InetAddress;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
-import org.apache.activemq.api.core.BroadcastEndpoint;
-import org.apache.activemq.api.core.BroadcastEndpointFactory;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.core.cluster.DiscoveryGroup;
-import org.apache.activemq.core.server.cluster.impl.BroadcastGroupImpl;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.utils.ActiveMQThreadFactory;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.BroadcastEndpoint;
+import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.core.cluster.DiscoveryGroup;
+import org.apache.activemq.artemis.core.server.cluster.impl.BroadcastGroupImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryTest.java
index 4a23fdd13e..82037a1365 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.discovery;
+package org.apache.activemq.artemis.tests.integration.discovery;
 
 import java.io.File;
 import java.net.InetAddress;
@@ -24,22 +24,22 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.BroadcastEndpoint;
-import org.apache.activemq.api.core.BroadcastEndpointFactory;
-import org.apache.activemq.api.core.JGroupsFileBroadcastEndpointFactory;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.core.management.CoreNotificationType;
-import org.apache.activemq.core.cluster.DiscoveryEntry;
-import org.apache.activemq.core.cluster.DiscoveryGroup;
-import org.apache.activemq.core.server.ActiveMQComponent;
-import org.apache.activemq.core.server.cluster.BroadcastGroup;
-import org.apache.activemq.core.server.cluster.impl.BroadcastGroupImpl;
-import org.apache.activemq.core.server.management.Notification;
-import org.apache.activemq.tests.integration.SimpleNotificationService;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.BroadcastEndpoint;
+import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.JGroupsFileBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.management.CoreNotificationType;
+import org.apache.activemq.artemis.tests.integration.SimpleNotificationService;
+import org.apache.activemq.artemis.core.cluster.DiscoveryEntry;
+import org.apache.activemq.artemis.core.cluster.DiscoveryGroup;
+import org.apache.activemq.artemis.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.core.server.cluster.BroadcastGroup;
+import org.apache.activemq.artemis.core.server.cluster.impl.BroadcastGroupImpl;
+import org.apache.activemq.artemis.core.server.management.Notification;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/divert/DivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/divert/DivertTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java
index e6c871f666..786823730e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/divert/DivertTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.divert;
+package org.apache.activemq.artemis.tests.integration.divert;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.DivertConfiguration;
-import org.apache.activemq.core.message.impl.MessageImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.DivertConfiguration;
+import org.apache.activemq.artemis.core.message.impl.MessageImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/divert/PersistentDivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/PersistentDivertTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/divert/PersistentDivertTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/PersistentDivertTest.java
index 0b3c8e6611..7d46b2ea3b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/divert/PersistentDivertTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/PersistentDivertTest.java
@@ -14,8 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.divert;
+package org.apache.activemq.artemis.tests.integration.divert;
 
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -23,20 +25,18 @@ import java.util.List;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.DivertConfiguration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.DivertConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
 
 public class PersistentDivertTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/embedded/ValidateAIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/embedded/ValidateAIOTest.java
similarity index 78%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/embedded/ValidateAIOTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/embedded/ValidateAIOTest.java
index 96338eeaf6..81e9f74b97 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/embedded/ValidateAIOTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/embedded/ValidateAIOTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.embedded;
+package org.apache.activemq.artemis.tests.integration.embedded;
 
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.JournalType;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.JournalType;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/http/CoreClientOverHttpTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/http/CoreClientOverHttpTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/http/CoreClientOverHttpTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/http/CoreClientOverHttpTest.java
index 2aef9c7945..485a28a026 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/http/CoreClientOverHttpTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/http/CoreClientOverHttpTest.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.http;
+package org.apache.activemq.artemis.tests.integration.http;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -24,21 +25,20 @@ import java.util.Random;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
 
 public class CoreClientOverHttpTest extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ActiveMQConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ActiveMQConnectionFactoryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
index 371ff0cb1a..e4d1898c98 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ActiveMQConnectionFactoryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
@@ -14,8 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
+package org.apache.activemq.artemis.tests.integration.jms;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -31,20 +33,18 @@ import javax.jms.Session;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.BroadcastGroupConfiguration;
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 /**
  *
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/FloodServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/FloodServerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
index 913573b1c8..7603397375 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/FloodServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
+package org.apache.activemq.artemis.tests.integration.jms;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
 import org.junit.Before;
 import org.junit.After;
 
@@ -33,19 +34,18 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 
 /**
  *
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JMSSecurityTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JMSSecurityTest.java
index ae6834c6b6..487c7ee083 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JMSSecurityTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms;
+package org.apache.activemq.artemis.tests.integration.jms;
 
 import javax.jms.JMSContext;
 import javax.jms.JMSSecurityException;
@@ -22,8 +22,8 @@ import javax.jms.JMSSecurityRuntimeException;
 import javax.jms.QueueConnection;
 import javax.jms.QueueConnectionFactory;
 
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JmsProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JmsProducerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
index 80a9aaee6c..e1aeddc700 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JmsProducerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms;
+package org.apache.activemq.artemis.tests.integration.jms;
 
 import javax.jms.DeliveryMode;
 import javax.jms.JMSConsumer;
@@ -26,13 +26,13 @@ import javax.jms.TextMessage;
 import java.util.ArrayList;
 import java.util.Random;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.client.impl.ClientSessionImpl;
-import org.apache.activemq.core.client.impl.DelegatingSession;
-import org.apache.activemq.jms.client.ActiveMQJMSContext;
-import org.apache.activemq.jms.client.ActiveMQSession;
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionImpl;
+import org.apache.activemq.artemis.core.client.impl.DelegatingSession;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSContext;
+import org.apache.activemq.artemis.jms.client.ActiveMQSession;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ManualReconnectionToSingleServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ManualReconnectionToSingleServerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
index 18d68e4242..cf44121ef5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ManualReconnectionToSingleServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
+package org.apache.activemq.artemis.tests.integration.jms;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
 import org.junit.Before;
 import org.junit.After;
 
@@ -42,19 +43,18 @@ import javax.naming.Context;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class ManualReconnectionToSingleServerTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/SimpleJNDIClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/SimpleJNDIClientTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java
index fdbcf33df4..73cc9f600f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/SimpleJNDIClientTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms;
+package org.apache.activemq.artemis.tests.integration.jms;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
@@ -30,24 +30,24 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.BroadcastEndpoint;
-import org.apache.activemq.api.core.BroadcastEndpointFactory;
-import org.apache.activemq.api.core.BroadcastGroupConfiguration;
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.JGroupsFileBroadcastEndpoint;
-import org.apache.activemq.api.core.JGroupsPropertiesBroadcastEndpointFactory;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jndi.ActiveMQInitialContextFactory;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.BroadcastEndpoint;
+import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.JGroupsFileBroadcastEndpoint;
+import org.apache.activemq.artemis.api.core.JGroupsPropertiesBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -70,7 +70,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testMultipleConnectionFactories() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.VmConnectionFactory", "vm://0");
       props.put("connectionFactory.TCPConnectionFactory", "tcp://localhost:61616");
       props.put("connectionFactory.UDPConnectionFactory", "udp://" + getUDPDiscoveryAddress() + ":" + getUDPDiscoveryPort());
@@ -86,7 +86,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testVMCF0() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.ConnectionFactory", "vm://0");
       Context ctx = new InitialContext(props);
 
@@ -99,7 +99,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testVMCF1() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.ConnectionFactory", "vm://1");
       Context ctx = new InitialContext(props);
 
@@ -112,7 +112,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testXACF() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.myConnectionFactory", "vm://0?type=XA_CF");
       Context ctx = new InitialContext(props);
 
@@ -125,7 +125,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testQueueCF() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.myConnectionFactory", "vm://0?type=QUEUE_CF");
       Context ctx = new InitialContext(props);
 
@@ -138,7 +138,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testQueueXACF() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.myConnectionFactory", "vm://0?type=QUEUE_XA_CF");
       Context ctx = new InitialContext(props);
 
@@ -151,7 +151,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testTopicCF() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.myConnectionFactory", "vm://0?type=TOPIC_CF");
       Context ctx = new InitialContext(props);
 
@@ -164,7 +164,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testTopicXACF() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.myConnectionFactory", "vm://0?type=TOPIC_XA_CF");
       Context ctx = new InitialContext(props);
 
@@ -177,7 +177,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testRemoteCFWithTCP() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:61616");
       Context ctx = new InitialContext(props);
 
@@ -190,7 +190,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testRemoteCFWithTCPandHA() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:61616?ha=true");
       Context ctx = new InitialContext(props);
 
@@ -203,7 +203,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testRemoteCFWithJGroups() throws Exception
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.myConnectionFactory", "jgroups://mychannelid?file=test-jgroups-file_ping.xml");
       Context ctx = new InitialContext(props);
 
@@ -215,7 +215,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testRemoteCFWithJgroupsWithTransportConfigFile() throws Exception
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, ActiveMQInitialContextFactory.class.getCanonicalName());
+      props.put(Context.INITIAL_CONTEXT_FACTORY, org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory.class.getCanonicalName());
       props.put("connectionFactory.myConnectionFactory", "jgroups://testChannelName?file=test-jgroups-file_ping.xml&" +
          ActiveMQInitialContextFactory.REFRESH_TIMEOUT + "=5000&" +
          ActiveMQInitialContextFactory.DISCOVERY_INITIAL_WAIT_TIMEOUT + "=6000");
@@ -285,7 +285,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testRemoteCFWithUDP() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.myConnectionFactory", "udp://" + getUDPDiscoveryAddress() + ":" + getUDPDiscoveryPort());
       Context ctx = new InitialContext(props);
 
@@ -324,7 +324,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testRemoteCFWithMultipleHosts() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:61616/httpEnabled=true&foo=bar,tcp://127.0.0.2:61617?httpEnabled=false?clientID=myClientID");
       Context ctx = new InitialContext(props);
 
@@ -337,7 +337,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testRemoteCFWithTransportConfig() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:61616?" +
          TransportConstants.SSL_ENABLED_PROP_NAME + "=mySSLEnabledPropValue&" +
          TransportConstants.HTTP_ENABLED_PROP_NAME + "=myHTTPEnabledPropValue&" +
@@ -423,7 +423,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
       connectorNames.add(liveTC.getName());
 
       Map params = new HashMap();
-      params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, 1);
+      params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, 1);
 
       Configuration liveConf = createBasicConfig()
          .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY))
@@ -459,7 +459,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testQueue() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("queue.myQueue", "myQueue");
       props.put("queue.queues/myQueue", "myQueue");
       Context ctx = new InitialContext(props);
@@ -475,7 +475,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testDynamicQueue() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       Context ctx = new InitialContext(props);
 
       Destination destination = (Destination) ctx.lookup("dynamicQueues/myQueue");
@@ -486,7 +486,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testTopic() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       props.put("topic.myTopic", "myTopic");
       props.put("topic.topics/myTopic", "myTopic");
       Context ctx = new InitialContext(props);
@@ -502,7 +502,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
    public void testDynamicTopic() throws NamingException, JMSException
    {
       Hashtable props = new Hashtable<>();
-      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       Context ctx = new InitialContext(props);
 
       Destination destination = (Destination) ctx.lookup("dynamicTopics/myTopic");
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/AutoGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/AutoGroupingTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/AutoGroupingTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/AutoGroupingTest.java
index 59d70872ad..79d879d0f5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/AutoGroupingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/AutoGroupingTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Message;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
 
 public class AutoGroupingTest extends GroupingTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ConnectionTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ConnectionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ConnectionTest.java
index e9e962258d..4249868308 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ConnectionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ConnectionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -31,7 +31,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/CreateQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/CreateQueueTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
index 2d89b5094f..33909b9aef 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/CreateQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
@@ -22,9 +22,9 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.Topic;
 
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import org.junit.Test;
 
 public class CreateQueueTest extends JMSTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ExpiryMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ExpiryMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
index 3e404ca49e..74a96b4aca 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ExpiryMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.Connection;
 import javax.jms.MessageProducer;
@@ -22,10 +22,10 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.activemq.api.jms.management.TopicControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.jms.management.TopicControl;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Test;
 
 public class ExpiryMessageTest extends JMSTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupIDTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupIDTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupIDTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupIDTest.java
index a1cbfc4a70..37cfdb0a94 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupIDTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupIDTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import org.junit.Test;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Message;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
 
 public class GroupIDTest extends GroupingTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java
index 60689554f9..41bbc6d5de 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
 import javax.jms.JMSException;
@@ -25,13 +25,13 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQMessage;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;
@@ -64,7 +64,7 @@ public class GroupingTest extends JMSTestBase
 
    protected void setProperty(Message message)
    {
-      ((ActiveMQMessage)message).getCoreMessage().putStringProperty(org.apache.activemq.api.core.Message.HDR_GROUP_ID, new SimpleString("foo"));
+      ((ActiveMQMessage)message).getCoreMessage().putStringProperty(org.apache.activemq.artemis.api.core.Message.HDR_GROUP_ID, new SimpleString("foo"));
    }
 
    protected ConnectionFactory getCF() throws Exception
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageProducerTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageProducerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageProducerTest.java
index 688d1a5ca4..7a91b31fad 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageProducerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageProducerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -22,7 +22,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
index 2981a5bde5..3c7b93e4de 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.Connection;
 import javax.jms.Message;
@@ -25,9 +25,9 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.StreamMessage;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NewQueueRequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NewQueueRequestorTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
index 88eae97c5e..83091d5772 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NewQueueRequestorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -29,8 +29,8 @@ import javax.jms.QueueSession;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Test;
 
 public class NewQueueRequestorTest extends JMSTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NoLocalSubscriberTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NoLocalSubscriberTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java
index 69aef0e96c..3ec86d3f9b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NoLocalSubscriberTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import org.junit.Test;
 
 import javax.jms.Connection;
@@ -28,9 +29,8 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.jms.TopicSubscriber;
 
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.JMSTestBase;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class NoLocalSubscriberTest extends JMSTestBase
 {
@@ -185,7 +185,7 @@ public class NoLocalSubscriberTest extends JMSTestBase
 
          // now drain the subscription
          // we should not receive message M3, but we should receive message M4
-         // However for some reason ActiveMQ Artemis doesn't receive either
+         // However for some reason Artemis doesn't receive either
          TextMessage textMessage = (TextMessage)topicSubscriber.receive(1000);
          assertNotNull(textMessage);
 
@@ -254,7 +254,7 @@ public class NoLocalSubscriberTest extends JMSTestBase
 
          // now drain the subscription
          // we should not receive message M3, but we should receive message M4
-         // However for some reason ActiveMQ Artemis doesn't receive either
+         // However for some reason Artemis doesn't receive either
          TextMessage textMessage = (TextMessage)topicSubscriber.receive(1000);
          assertNotNull(textMessage);
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/PreACKJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/PreACKJMSTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
index f9cb378b6f..65747b158c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/PreACKJMSTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
@@ -24,12 +24,11 @@ import javax.jms.TextMessage;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -83,9 +82,9 @@ public class PreACKJMSTest extends JMSTestBase
 
       TextMessage msg2 = (TextMessage) cons.receive(1000);
 
-      Assert.assertNotNull(msg2);
+      assertNotNull(msg2);
 
-      Assert.assertEquals(msg1.getText(), msg2.getText());
+      assertEquals(msg1.getText(), msg2.getText());
 
       conn.close();
 
@@ -99,7 +98,7 @@ public class PreACKJMSTest extends JMSTestBase
 
       msg2 = (TextMessage) cons.receiveNoWait();
 
-      Assert.assertNull("ConnectionFactory is on PreACK mode, the message shouldn't be received", msg2);
+      assertNull("ConnectionFactory is on PreACK mode, the message shouldn't be received", msg2);
    }
 
    public void disabled_testPreACKTransactional() throws Exception
@@ -121,9 +120,9 @@ public class PreACKJMSTest extends JMSTestBase
 
       TextMessage msg2 = (TextMessage) cons.receive(1000);
 
-      Assert.assertNotNull(msg2);
+      assertNotNull(msg2);
 
-      Assert.assertEquals(msg1.getText(), msg2.getText());
+      assertEquals(msg1.getText(), msg2.getText());
 
       sess.rollback();
 
@@ -139,7 +138,7 @@ public class PreACKJMSTest extends JMSTestBase
 
       msg2 = (TextMessage) cons.receive(10);
 
-      Assert.assertNotNull("ConnectionFactory is on PreACK mode but it is transacted", msg2);
+      assertNotNull("ConnectionFactory is on PreACK mode but it is transacted", msg2);
    }
 
    // Package protected ---------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReSendMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReSendMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java
index be46c00039..2f70bf3834 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReSendMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.BytesMessage;
 import javax.jms.MapMessage;
@@ -29,12 +29,12 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.jms.ActiveMQJMSConstants;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.tests.util.JMSTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReceiveNoWaitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReceiveNoWaitTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReceiveNoWaitTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReceiveNoWaitTest.java
index 0628915732..c3557d0a46 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReceiveNoWaitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReceiveNoWaitTest.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -28,8 +29,6 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.tests.util.JMSTestBase;
-
 /**
  *
  * A ReceiveNoWaitTest
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/RemoteConnectionStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RemoteConnectionStressTest.java
similarity index 77%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/RemoteConnectionStressTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RemoteConnectionStressTest.java
index 9d51ea2f4d..801467b218 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/RemoteConnectionStressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RemoteConnectionStressTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.Connection;
 import javax.jms.MessageProducer;
@@ -24,17 +24,17 @@ import javax.jms.TextMessage;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -56,7 +56,7 @@ public class RemoteConnectionStressTest extends ServiceTestBase
       super.setUp();
 
       Configuration conf = ServiceTestBase.createBasicConfigNoDataFolder();
-      conf.getAcceptorConfigurations().add(new TransportConfiguration("org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory"));
+      conf.getAcceptorConfigurations().add(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory"));
 
       mbeanServer = MBeanServerFactory.createMBeanServer();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
index 6ba9a58497..4f3df4b760 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -32,14 +32,14 @@ import javax.jms.Session;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.jms.client.ActiveMQSession;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.jms.client.ActiveMQSession;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 
 /**
  *
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionTest.java
index 3ce221b47a..c685e2bf47 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.Connection;
 import javax.jms.QueueConnection;
@@ -22,8 +22,8 @@ import javax.jms.QueueSession;
 import javax.jms.Session;
 import javax.jms.Topic;
 
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 import org.junit.Test;
 
 public class SessionTest extends JMSTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/StoreConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/StoreConfigTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/StoreConfigTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/StoreConfigTest.java
index e4d4592578..acd30132cc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/StoreConfigTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/StoreConfigTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import org.junit.Test;
 
@@ -30,9 +30,9 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.naming.NamingException;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 
 public class StoreConfigTest extends JMSTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TextMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TextMessageTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TextMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TextMessageTest.java
index 3cd24f2659..5d1301850d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TextMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TextMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
@@ -23,11 +23,11 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import java.util.List;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.tests.util.JMSTestBase;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TopicCleanupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TopicCleanupTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
index 27fbb7ac9f..a6ab6afa05 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TopicCleanupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.client;
+package org.apache.activemq.artemis.tests.integration.jms.client;
 
 import javax.jms.Connection;
 import javax.jms.MessageConsumer;
@@ -23,14 +23,14 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.filter.impl.FilterImpl;
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.core.filter.impl.FilterImpl;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java
index a54ebbcf73..d6992ecf44 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.cluster;
+package org.apache.activemq.artemis.tests.integration.jms.cluster;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.remoting.FailureListener;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.cluster.Bridge;
-import org.apache.activemq.core.server.cluster.impl.BridgeImpl;
-import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.JMSClusteredTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.remoting.FailureListener;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.cluster.Bridge;
+import org.apache.activemq.artemis.core.server.cluster.impl.BridgeImpl;
+import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionImpl;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.util.JMSClusteredTestBase;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverListenerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
index 11cbe410c3..f2d4726778 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.cluster;
+package org.apache.activemq.artemis.tests.integration.jms.cluster;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -30,34 +30,34 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.FailoverEventListener;
-import org.apache.activemq.api.core.client.FailoverEventType;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.InVMRegistry;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.jms.client.ActiveMQConnection;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQSession;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.jms.server.management.JMSUtil;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.InVMNodeManagerServer;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.FailoverEventListener;
+import org.apache.activemq.artemis.api.core.client.FailoverEventType;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQSession;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.jms.server.management.JMSUtil;
+import org.apache.activemq.artemis.tests.util.InVMNodeManagerServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
index ff08edacc6..bdb012690d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.cluster;
+package org.apache.activemq.artemis.tests.integration.jms.cluster;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -32,39 +32,39 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.InVMRegistry;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.NodeManager;
-import org.apache.activemq.core.server.impl.InVMNodeManager;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQSession;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.jms.server.management.JMSUtil;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.InVMNodeManagerServer;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.NodeManager;
+import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQSession;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.integration.jms.server.management.JMSUtil;
+import org.apache.activemq.artemis.tests.util.InVMNodeManagerServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java
index 0f0216fd06..4434ea0ee8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.cluster;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
+package org.apache.activemq.artemis.tests.integration.jms.cluster;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -37,22 +38,21 @@ import javax.jms.Topic;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMRegistry;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQSession;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMRegistry;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQSession;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class JMSReconnectTest extends UnitTestCase
 {
@@ -75,7 +75,7 @@ public class JMSReconnectTest extends UnitTestCase
 
    private void testReconnectOrReattachSameNode(boolean reattach) throws Exception
    {
-      ActiveMQConnectionFactory jbcf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"));
+      ActiveMQConnectionFactory jbcf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"));
 
       jbcf.setBlockOnDurableSend(true);
       jbcf.setBlockOnNonDurableSend(true);
@@ -179,7 +179,7 @@ public class JMSReconnectTest extends UnitTestCase
    //Test that non durable JMS sub gets recreated in auto reconnect
    private void testReconnectSameNodeServerRestartedWithNonDurableSubOrTempQueue(final boolean nonDurableSub) throws Exception
    {
-      ActiveMQConnectionFactory jbcf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"));
+      ActiveMQConnectionFactory jbcf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"));
 
       jbcf.setReconnectAttempts(-1);
 
@@ -255,7 +255,7 @@ public class JMSReconnectTest extends UnitTestCase
    @Test
    public void testNoReconnectCloseAfterFailToReconnectWithTopicConsumer() throws Exception
    {
-      ActiveMQConnectionFactory jbcf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"));
+      ActiveMQConnectionFactory jbcf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"));
 
       jbcf.setReconnectAttempts(0);
 
@@ -287,7 +287,7 @@ public class JMSReconnectTest extends UnitTestCase
    @Test
    public void testNoReconnectCloseAfterFailToReconnectWithTempQueue() throws Exception
    {
-      ActiveMQConnectionFactory jbcf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"));
+      ActiveMQConnectionFactory jbcf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"));
 
       jbcf.setReconnectAttempts(0);
 
@@ -321,7 +321,7 @@ public class JMSReconnectTest extends UnitTestCase
 
       Configuration liveConf = createBasicConfig()
          .setJournalType(getDefaultJournalType())
-         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory"))
+         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory"))
          .setBindingsDirectory(getBindingsDir())
          .setJournalMinFiles(2)
          .setJournalDirectory(getJournalDir())
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java
index 90c9142aa4..5b751f5374 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.cluster;
+package org.apache.activemq.artemis.tests.integration.jms.cluster;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -28,14 +28,14 @@ import javax.jms.TextMessage;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.ClusterConnectionConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.tests.util.JMSClusteredTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.tests.util.JMSClusteredTestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
index 7ce3024046..4c5f9d0726 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.cluster;
+package org.apache.activemq.artemis.tests.integration.jms.cluster;
 
 import javax.jms.Connection;
 import javax.jms.Session;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.tests.util.JMSClusteredTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.util.JMSClusteredTestBase;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
 import org.junit.Test;
 
 public class MultipleThreadsOpeningTest extends JMSClusteredTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java
similarity index 80%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java
index 08ba14c58d..8ff42332ad 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.cluster;
+package org.apache.activemq.artemis.tests.integration.jms.cluster;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
 
 public class ReplicatedJMSFailoverTest extends JMSFailoverTest
 {
@@ -56,7 +56,7 @@ public class ReplicatedJMSFailoverTest extends JMSFailoverTest
       liveConf = createBasicConfig()
          .setJournalType(getDefaultJournalType())
          .addConnectorConfiguration("toBackup", new TransportConfiguration(INVM_CONNECTOR_FACTORY, backupParams))
-         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory"))
+         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory"))
          .setBindingsDirectory(getBindingsDir(0, false))
          .setJournalMinFiles(2)
          .setJournalDirectory(getJournalDir(0, false))
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
index 5765940cb9..02ae169776 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.cluster;
+package org.apache.activemq.artemis.tests.integration.jms.cluster;
 import org.junit.Before;
 import org.junit.After;
 
@@ -27,7 +27,7 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.tests.util.JMSClusteredTestBase;
+import org.apache.activemq.artemis.tests.util.JMSClusteredTestBase;
 
 public class TemporaryQueueClusterTest extends JMSClusteredTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TopicClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TopicClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java
index 4423565764..70ca080539 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TopicClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.cluster;
+package org.apache.activemq.artemis.tests.integration.jms.cluster;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -24,7 +24,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.activemq.tests.util.JMSClusteredTestBase;
+import org.apache.activemq.artemis.tests.util.JMSClusteredTestBase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java
similarity index 78%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java
index 9327f58a76..3cabc2df5e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.connection;
+package org.apache.activemq.artemis.tests.integration.jms.connection;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.jms.Connection;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.client.impl.ServerLocatorImpl;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 
 /**
  *
@@ -53,7 +53,7 @@ public class CloseConnectionFactoryOnGCest extends JMSTestBase
          for (int i = 0; i < 100; i++)
          {
             ActiveMQConnectionFactory cf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF,
-                                                                                              new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"));
+                                                                                              new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"));
             Connection conn = cf.createConnection();
             cf = null;
             conn.close();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionOnGCTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionOnGCTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionOnGCTest.java
index fb6447efe1..4d25c25b4e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionOnGCTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionOnGCTest.java
@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.connection;
+package org.apache.activemq.artemis.tests.integration.jms.connection;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -30,14 +32,12 @@ import javax.jms.Session;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.remoting.CloseListener;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.JMSTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.remoting.CloseListener;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 /**
  *
@@ -53,7 +53,7 @@ public class CloseConnectionOnGCTest extends JMSTestBase
    {
       super.setUp();
 
-      cf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"));
+      cf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"));
       cf.setBlockOnDurableSend(true);
       cf.setPreAcknowledge(true);
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseDestroyedConnectionTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseDestroyedConnectionTest.java
index 973fc2b463..983a252f8c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseDestroyedConnectionTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.connection;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQInternalErrorException;
+package org.apache.activemq.artemis.tests.integration.jms.connection;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException;
 import org.junit.Before;
 import org.junit.After;
 
@@ -30,16 +30,16 @@ import javax.jms.Session;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQSession;
-import org.apache.activemq.jms.client.ActiveMQTemporaryTopic;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQSession;
+import org.apache.activemq.artemis.jms.client.ActiveMQTemporaryTopic;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 
 public class CloseDestroyedConnectionTest extends JMSTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConcurrentSessionCloseTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConcurrentSessionCloseTest.java
index a3df48f848..88cc9e204e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConcurrentSessionCloseTest.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.connection;
+package org.apache.activemq.artemis.tests.integration.jms.connection;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -25,11 +26,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import javax.jms.Connection;
 import javax.jms.Session;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 
 /**
  *
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
index 8a8757f5b7..0b18c765c4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.connection;
+package org.apache.activemq.artemis.tests.integration.jms.connection;
 
 import java.beans.PropertyDescriptor;
 import java.io.ByteArrayInputStream;
@@ -32,18 +32,18 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.JGroupsFileBroadcastEndpointFactory;
-import org.apache.activemq.api.core.JGroupsPropertiesBroadcastEndpointFactory;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.tests.util.JMSTestBase;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.JGroupsFileBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.JGroupsPropertiesBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.junit.Assert;
 import org.junit.Before;
@@ -74,7 +74,7 @@ public class ConnectionFactorySerializationTest extends JMSTestBase
       createDiscoveryFactoryUDP();
       cf = (ActiveMQConnectionFactory) namingContext.lookup("/MyConnectionFactory");
 
-      // apparently looking up the connection factory with the org.apache.activemq.jms.tests.tools.container.InVMInitialContextFactory
+      // apparently looking up the connection factory with the org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory
       // is not enough to actually serialize it so we serialize it manually
       byte[] x = serialize(cf);
       ActiveMQConnectionFactory y = deserialize(x, ActiveMQConnectionFactory.class);
@@ -97,7 +97,7 @@ public class ConnectionFactorySerializationTest extends JMSTestBase
       createDiscoveryFactoryJGroupsFile();
       cf = (ActiveMQConnectionFactory) namingContext.lookup("/MyConnectionFactory");
 
-      // apparently looking up the connection factory with the org.apache.activemq.jms.tests.tools.container.InVMInitialContextFactory
+      // apparently looking up the connection factory with the org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory
       // is not enough to actually serialize it so we serialize it manually
       byte[] x = serialize(cf);
       ActiveMQConnectionFactory y = deserialize(x, ActiveMQConnectionFactory.class);
@@ -118,7 +118,7 @@ public class ConnectionFactorySerializationTest extends JMSTestBase
       createDiscoveryFactoryJGroupsProperties();
       cf = (ActiveMQConnectionFactory) namingContext.lookup("/MyConnectionFactory");
 
-      // apparently looking up the connection factory with the org.apache.activemq.jms.tests.tools.container.InVMInitialContextFactory
+      // apparently looking up the connection factory with the org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory
       // is not enough to actually serialize it so we serialize it manually
       byte[] x = serialize(cf);
       ActiveMQConnectionFactory y = deserialize(x, ActiveMQConnectionFactory.class);
@@ -139,7 +139,7 @@ public class ConnectionFactorySerializationTest extends JMSTestBase
       createStaticFactory(true);
       cf = (ActiveMQConnectionFactory) namingContext.lookup("/MyConnectionFactory");
 
-      // apparently looking up the connection factory with the org.apache.activemq.jms.tests.tools.container.InVMInitialContextFactory
+      // apparently looking up the connection factory with the org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory
       // is not enough to actually serialize it so we serialize it manually
       byte[] x = serialize(cf);
       ActiveMQConnectionFactory y = deserialize(x, ActiveMQConnectionFactory.class);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
index 6a033c0e24..b34e8e7777 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.connection;
+package org.apache.activemq.artemis.tests.integration.jms.connection;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,13 +25,13 @@ import java.io.Serializable;
 
 import javax.jms.Queue;
 
-import org.apache.activemq.api.core.BroadcastEndpointFactory;
-import org.apache.activemq.api.core.ChannelBroadcastEndpointFactory;
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.JGroupsFileBroadcastEndpointFactory;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.ChannelBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.JGroupsFileBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.jgroups.JChannel;
 import org.jgroups.conf.PlainConfigurator;
 import org.junit.After;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java
similarity index 79%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java
index bc689032fa..b89fa13c0d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.connection;
-import org.apache.activemq.api.core.ActiveMQInternalErrorException;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
+package org.apache.activemq.artemis.tests.integration.jms.connection;
+import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
 import org.junit.Before;
 import org.junit.After;
 
@@ -32,19 +33,18 @@ import javax.jms.Session;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQConnection;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQSession;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.integration.jms.server.management.NullInitialContext;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQSession;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.integration.jms.server.management.NullInitialContext;
 
 /**
  *
@@ -67,13 +67,13 @@ public class ExceptionListenerTest extends UnitTestCase
       super.setUp();
 
       Configuration conf = createBasicConfig()
-         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory"));
+         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory"));
       server = addServer(ActiveMQServers.newActiveMQServer(conf, false));
       jmsServer = new JMSServerManagerImpl(server);
       jmsServer.setRegistry(new JndiBindingRegistry(new NullInitialContext()));
       jmsServer.start();
       jmsServer.createQueue(false, ExceptionListenerTest.Q_NAME, null, true, ExceptionListenerTest.Q_NAME);
-      cf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"));
+      cf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"));
       cf.setBlockOnDurableSend(true);
       cf.setPreAcknowledge(true);
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/InvalidConnectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/InvalidConnectorTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/InvalidConnectorTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/InvalidConnectorTest.java
index d5fa8487d9..893154c449 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/InvalidConnectorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/InvalidConnectorTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.connection;
+package org.apache.activemq.artemis.tests.integration.jms.connection;
 import org.junit.Before;
 import org.junit.After;
 
 import org.junit.Test;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/consumer/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/consumer/ConsumerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java
index 2e1355e090..06632d9ab0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/consumer/ConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.consumer;
+package org.apache.activemq.artemis.tests.integration.jms.consumer;
 
 import javax.jms.Connection;
 import javax.jms.JMSConsumer;
@@ -32,17 +32,17 @@ import javax.jms.TextMessage;
 import java.util.Enumeration;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.ActiveMQJMSConstants;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.JMSTestBase;
-import org.apache.activemq.utils.ReusableLatch;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.utils.ReusableLatch;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -76,7 +76,7 @@ public class ConsumerTest extends JMSTestBase
       jmsServer.createQueue(false, ConsumerTest.Q_NAME, null, true, ConsumerTest.Q_NAME);
       jmsServer.createTopic(true, T_NAME, "/topic/" + T_NAME);
       jmsServer.createTopic(true, T2_NAME, "/topic/" + T2_NAME);
-      cf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"));
+      cf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"));
    }
 
    @Override
@@ -113,15 +113,15 @@ public class ConsumerTest extends JMSTestBase
       sess.commit();
 
       TextMessage m1 = (TextMessage) cons.receive(2000);
-      assertNotNull(m1);
-      assertEquals("m1", m1.getText());
+      Assert.assertNotNull(m1);
+      Assert.assertEquals("m1", m1.getText());
 
       TextMessage m2 = (TextMessage) cons.receive(2000);
-      assertNotNull(m2);
-      assertEquals("m3", m2.getText());
+      Assert.assertNotNull(m2);
+      Assert.assertEquals("m3", m2.getText());
 
       TextMessage m3 = (TextMessage) cons.receive(2000);
-      assertNull("m3 should be null", m3);
+      Assert.assertNull("m3 should be null", m3);
 
       System.out.println("received m1: " + m1.getText());
       System.out.println("received m2: " + m2.getText());
@@ -197,9 +197,9 @@ public class ConsumerTest extends JMSTestBase
          }
 
          TextMessage m = (TextMessage) consumer.receive(1000);
-         assertNotNull(m);
+         Assert.assertNotNull(m);
          m.acknowledge();
-         assertEquals("m" + i, m.getText());
+         Assert.assertEquals("m" + i, m.getText());
       }
 
       SimpleString queueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + ConsumerTest.Q_NAME);
@@ -265,7 +265,7 @@ public class ConsumerTest extends JMSTestBase
 
       consumer.setMessageListener(new MessageAckEven());
 
-      assertTrue(latch.await(5000));
+      Assert.assertTrue(latch.await(5000));
 
       session.close();
 
@@ -282,9 +282,9 @@ public class ConsumerTest extends JMSTestBase
          }
 
          TextMessage m = (TextMessage) consumer.receive(1000);
-         assertNotNull(m);
+         Assert.assertNotNull(m);
          m.acknowledge();
-         assertEquals("m" + i, m.getText());
+         Assert.assertEquals("m" + i, m.getText());
       }
 
       SimpleString queueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + ConsumerTest.Q_NAME);
@@ -409,18 +409,18 @@ public class ConsumerTest extends JMSTestBase
       for (int i = 0; i < noOfMessages; i++)
       {
          TextMessage msg = (TextMessage) enumMessages.nextElement();
-         assertNotNull(msg);
-         assertEquals(i, msg.getIntProperty("i"));
+         Assert.assertNotNull(msg);
+         Assert.assertEquals(i, msg.getIntProperty("i"));
 
          conn.start();
          TextMessage recvMessage = (TextMessage) consumer.receiveNoWait();
-         assertNotNull(recvMessage);
+         Assert.assertNotNull(recvMessage);
          conn.stop();
-         assertEquals(i, msg.getIntProperty("i"));
+         Assert.assertEquals(i, msg.getIntProperty("i"));
       }
 
-      assertNull(consumer.receiveNoWait());
-      assertFalse(enumMessages.hasMoreElements());
+      Assert.assertNull(consumer.receiveNoWait());
+      Assert.assertFalse(enumMessages.hasMoreElements());
 
       conn.close();
 
@@ -458,16 +458,16 @@ public class ConsumerTest extends JMSTestBase
       for (int i = 0; i < noOfMessages; i++)
       {
          TextMessage msg = (TextMessage) enumMessages.nextElement();
-         assertNotNull(msg);
-         assertEquals(i, msg.getIntProperty("i"));
+         Assert.assertNotNull(msg);
+         Assert.assertEquals(i, msg.getIntProperty("i"));
 
          TextMessage recvMessage = (TextMessage) consumer.receiveNoWait();
-         assertNotNull(recvMessage);
-         assertEquals(i, msg.getIntProperty("i"));
+         Assert.assertNotNull(recvMessage);
+         Assert.assertEquals(i, msg.getIntProperty("i"));
       }
 
       Message m = consumer.receiveNoWait();
-      assertFalse(enumMessages.hasMoreElements());
+      Assert.assertFalse(enumMessages.hasMoreElements());
       Assert.assertNull(m);
 
       conn.close();
@@ -495,14 +495,14 @@ public class ConsumerTest extends JMSTestBase
 
       for (int i = 0; i < noOfMessages; i++)
       {
-         assertTrue(enumMessages.hasMoreElements());
+         Assert.assertTrue(enumMessages.hasMoreElements());
          TextMessage msg = (TextMessage) enumMessages.nextElement();
-         assertNotNull(msg);
-         assertEquals(i, msg.getIntProperty("i"));
+         Assert.assertNotNull(msg);
+         Assert.assertEquals(i, msg.getIntProperty("i"));
 
       }
 
-      assertFalse(enumMessages.hasMoreElements());
+      Assert.assertFalse(enumMessages.hasMoreElements());
 
       conn.close();
 
@@ -571,7 +571,7 @@ public class ConsumerTest extends JMSTestBase
 
       TextMessage txt = (TextMessage) cons.receive(5000);
 
-      assertNotNull(txt);
+      Assert.assertNotNull(txt);
    }
 
    @Test
@@ -591,7 +591,7 @@ public class ConsumerTest extends JMSTestBase
 
       TextMessage txt = (TextMessage) cons.receive(5000);
 
-      assertNotNull(txt);
+      Assert.assertNotNull(txt);
    }
 
    @Test
@@ -619,7 +619,7 @@ public class ConsumerTest extends JMSTestBase
             exception = true;
          }
 
-         assertTrue(exception);
+         Assert.assertTrue(exception);
          conn3.close();
       }
 
@@ -634,7 +634,7 @@ public class ConsumerTest extends JMSTestBase
 
       TextMessage txt = (TextMessage) cons.receive(5000);
 
-      assertNotNull(txt);
+      Assert.assertNotNull(txt);
    }
 
    @Test
@@ -659,7 +659,7 @@ public class ConsumerTest extends JMSTestBase
          exceptionHappened = true;
       }
 
-      assertTrue(exceptionHappened);
+      Assert.assertTrue(exceptionHappened);
 
 
       MessageProducer producer = session.createProducer(topic2);
@@ -673,7 +673,7 @@ public class ConsumerTest extends JMSTestBase
       producer.send(session.createTextMessage("hello!"));
 
       TextMessage msg = (TextMessage) cons2.receive(5000);
-      assertNotNull(msg);
+      Assert.assertNotNull(msg);
 
 
       exceptionHappened = false;
@@ -687,7 +687,7 @@ public class ConsumerTest extends JMSTestBase
       }
 
 
-      assertTrue(exceptionHappened);
+      Assert.assertTrue(exceptionHappened);
       cons2.close();
       conn.close();
       conn2.close();
@@ -711,7 +711,7 @@ public class ConsumerTest extends JMSTestBase
          prod.send(session.createTextMessage("msg" + i));
       }
 
-      assertNotNull(cons.receive(5000));
+      Assert.assertNotNull(cons.receive(5000));
 
       cons.close();
 
@@ -720,7 +720,7 @@ public class ConsumerTest extends JMSTestBase
       cons = session.createSharedDurableConsumer(topic, "c1");
 
       // it should be null since the queue was deleted through unsubscribe
-      assertNull(cons.receiveNoWait());
+      Assert.assertNull(cons.receiveNoWait());
    }
 
    @Test
@@ -746,13 +746,13 @@ public class ConsumerTest extends JMSTestBase
       for (int i = 0; i < 50; i++)
       {
          Message msg = cons.receive(5000);
-         assertNotNull(msg);
+         Assert.assertNotNull(msg);
          msg = cons2.receive(5000);
-         assertNotNull(msg);
+         Assert.assertNotNull(msg);
       }
 
-      assertNull(cons.receiveNoWait());
-      assertNull(cons2.receiveNoWait());
+      Assert.assertNull(cons.receiveNoWait());
+      Assert.assertNull(cons2.receiveNoWait());
 
       cons.close();
 
@@ -767,7 +767,7 @@ public class ConsumerTest extends JMSTestBase
          exceptionHappened = true;
       }
 
-      assertTrue(exceptionHappened);
+      Assert.assertTrue(exceptionHappened);
 
       cons2.close();
 
@@ -782,7 +782,7 @@ public class ConsumerTest extends JMSTestBase
       cons = session.createSharedDurableConsumer(topic, "c1");
 
       // it should be null since the queue was deleted through unsubscribe
-      assertNull(cons.receiveNoWait());
+      Assert.assertNull(cons.receiveNoWait());
    }
 
 
@@ -809,15 +809,15 @@ public class ConsumerTest extends JMSTestBase
       {
          String txt = consumer.receiveBody(String.class, 5000);
          System.out.println("TXT:" + txt);
-         assertNotNull(txt);
+         Assert.assertNotNull(txt);
 
          txt = consumer.receiveBody(String.class, 5000);
          System.out.println("TXT:" + txt);
-         assertNotNull(txt);
+         Assert.assertNotNull(txt);
       }
 
-      assertNull(consumer.receiveNoWait());
-      assertNull(consumer2.receiveNoWait());
+      Assert.assertNull(consumer.receiveNoWait());
+      Assert.assertNull(consumer2.receiveNoWait());
 
       boolean exceptionHappened = false;
 
@@ -832,7 +832,7 @@ public class ConsumerTest extends JMSTestBase
          exceptionHappened = true;
       }
 
-      assertTrue(exceptionHappened);
+      Assert.assertTrue(exceptionHappened);
 
       consumer.close();
       consumer2.close();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/divert/DivertAndACKClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/divert/DivertAndACKClientTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java
index aab216e405..5f44531b4d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/divert/DivertAndACKClientTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.divert;
+package org.apache.activemq.artemis.tests.integration.jms.divert;
 
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -30,12 +31,11 @@ import javax.jms.TextMessage;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.DivertConfiguration;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.DivertConfiguration;
 
 /**
  * A DivertAndACKClientTest
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/BodyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/BodyTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/BodyTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/BodyTest.java
index 38833b5e65..e443e824bb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/BodyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/BodyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.jms2client;
+package org.apache.activemq.artemis.tests.integration.jms.jms2client;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -24,8 +24,8 @@ import javax.jms.MessageFormatException;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/InvalidDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/InvalidDestinationTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/InvalidDestinationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/InvalidDestinationTest.java
index 620b8c80c1..712ef9f343 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/InvalidDestinationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/InvalidDestinationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.jms2client;
+package org.apache.activemq.artemis.tests.integration.jms.jms2client;
 
 import javax.jms.Connection;
 import javax.jms.Destination;
@@ -30,7 +30,7 @@ import javax.jms.Topic;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/JmsContextTest.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsContextTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/JmsContextTest.java
index cb1d699f83..f47a1320b4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsContextTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/JmsContextTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.jms2client;
+package org.apache.activemq.artemis.tests.integration.jms.jms2client;
 
 import javax.jms.BytesMessage;
 import javax.jms.CompletionListener;
@@ -40,7 +40,7 @@ import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java
index a8a4efd4bd..6d65909b93 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.jms2client;
+package org.apache.activemq.artemis.tests.integration.jms.jms2client;
 
 import javax.jms.CompletionListener;
 import javax.jms.Connection;
@@ -32,8 +32,8 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -92,7 +92,7 @@ public class JmsProducerCompletionListenerTest extends JMSTestBase
       receiveMessages(consumer, 0, TOTAL_MSGS, true);
 
       context.close();
-      assertTrue("completion listener should be called", cl.completionLatch.await(3, TimeUnit.SECONDS));
+      Assert.assertTrue("completion listener should be called", cl.completionLatch.await(3, TimeUnit.SECONDS));
    }
 
    @Test
@@ -105,7 +105,7 @@ public class JmsProducerCompletionListenerTest extends JMSTestBase
          Session session = connection.createSession();
          MessageProducer prod = session.createProducer(queue);
          prod.send(session.createMessage(), null);
-         fail("Didn't get expected exception!");
+         Assert.fail("Didn't get expected exception!");
       }
       catch (IllegalArgumentException expected)
       {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/NonExistentQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/NonExistentQueueTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java
index 98e0f75f81..f409066934 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/NonExistentQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.jms2client;
+package org.apache.activemq.artemis.tests.integration.jms.jms2client;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -29,11 +29,11 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import java.util.Random;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/SharedConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/SharedConsumerTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/SharedConsumerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/SharedConsumerTest.java
index f2d6ecc4eb..9de9887300 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/SharedConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/SharedConsumerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.jms2client;
+package org.apache.activemq.artemis.tests.integration.jms.jms2client;
 
 import javax.jms.JMSConsumer;
 import javax.jms.JMSContext;
@@ -23,9 +23,9 @@ import javax.jms.JMSRuntimeException;
 import javax.jms.Topic;
 import java.util.Random;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java
index 63a8dbad8e..11d40b1262 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.largemessage;
+package org.apache.activemq.artemis.tests.integration.jms.largemessage;
 
 import javax.jms.BytesMessage;
 import javax.jms.JMSException;
@@ -30,9 +30,9 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.tests.util.JMSTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -332,7 +332,7 @@ public class JMSLargeMessageTest extends JMSTestBase
       Assert.assertNotNull(rm);
 
       String str = rm.getText();
-      assertEquals(originalString, str);
+      Assert.assertEquals(originalString, str);
       conn.close();
       validateNoFilesOnLargeDir(0);
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
index f5ca9fabb0..4f31da227a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server;
+package org.apache.activemq.artemis.tests.integration.jms.server;
 
 import javax.jms.Queue;
 import javax.jms.Topic;
 import javax.naming.Context;
 
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerStartStopTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerStartStopTest.java
index ca4a6a6dba..5699bf2d40 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerStartStopTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server;
+package org.apache.activemq.artemis.tests.integration.jms.server;
 
 import javax.jms.Connection;
 import javax.jms.MessageConsumer;
@@ -25,21 +25,21 @@ import javax.jms.TextMessage;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.FileDeploymentManager;
-import org.apache.activemq.core.config.impl.FileConfiguration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.FileDeploymentManager;
+import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSConfigurationTest.java
similarity index 73%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSConfigurationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSConfigurationTest.java
index c3d1f1dd8a..f341af2cea 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSConfigurationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSConfigurationTest.java
@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.config;
+package org.apache.activemq.artemis.tests.integration.jms.server.config;
 
-import org.apache.activemq.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -30,23 +32,21 @@ import javax.naming.Context;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.jms.server.config.TopicConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.TopicConfigurationImpl;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
+import org.apache.activemq.artemis.jms.server.config.TopicConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.TopicConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class JMSConfigurationTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java
index 6a089f5514..1e95872854 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.config;
+package org.apache.activemq.artemis.tests.integration.jms.server.config;
 
-import org.apache.activemq.core.config.FileDeploymentManager;
-import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration;
+import org.apache.activemq.artemis.core.config.FileDeploymentManager;
+import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
 import org.junit.Test;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.jms.server.config.JMSQueueConfiguration;
-import org.apache.activemq.jms.server.config.TopicConfiguration;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration;
+import org.apache.activemq.artemis.jms.server.config.TopicConfiguration;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class JMSServerConfigParserTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/ConnectionFactoryControlTest.java
similarity index 69%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/ConnectionFactoryControlTest.java
index e8f81eccde..46be23cf14 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/ConnectionFactoryControlTest.java
@@ -14,30 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.management.Notification;
 
-import org.apache.activemq.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.After;
 import org.junit.Test;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.api.jms.management.ConnectionFactoryControl;
-import org.apache.activemq.api.jms.management.JMSServerControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.jms.server.management.JMSNotificationType;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.integration.management.ManagementTestBase;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.api.jms.management.ConnectionFactoryControl;
+import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.jms.server.management.JMSNotificationType;
 
 /**
  * A Connection Factory Control Test
@@ -71,12 +73,12 @@ public class ConnectionFactoryControlTest extends ManagementTestBase
 
       ActiveMQConnectionFactory cf = (ActiveMQConnectionFactory)ctx.lookup("test");
 
-      assertFalse(cf.isCompressLargeMessage());
+      Assert.assertFalse(cf.isCompressLargeMessage());
 
       controlCF.setCompressLargeMessages(true);
 
       cf = (ActiveMQConnectionFactory)ctx.lookup("test");
-      assertTrue(cf.isCompressLargeMessage());
+      Assert.assertTrue(cf.isCompressLargeMessage());
 
       stopServer();
 
@@ -85,7 +87,7 @@ public class ConnectionFactoryControlTest extends ManagementTestBase
       startServer();
 
       cf = (ActiveMQConnectionFactory)ctx.lookup("test");
-      assertTrue(cf.isCompressLargeMessage());
+      Assert.assertTrue(cf.isCompressLargeMessage());
 
    }
 
@@ -108,28 +110,28 @@ public class ConnectionFactoryControlTest extends ManagementTestBase
 
       Notification notif = listener.getNotification();
 
-      assertEquals(JMSNotificationType.CONNECTION_FACTORY_CREATED.toString(), notif.getType());
-      assertEquals("NewCF", notif.getMessage());
+      Assert.assertEquals(JMSNotificationType.CONNECTION_FACTORY_CREATED.toString(), notif.getType());
+      Assert.assertEquals("NewCF", notif.getMessage());
 
       this.serverManager.destroyConnectionFactory("NewCF");
 
       notif = listener.getNotification();
-      assertEquals(JMSNotificationType.CONNECTION_FACTORY_DESTROYED.toString(), notif.getType());
-      assertEquals("NewCF", notif.getMessage());
+      Assert.assertEquals(JMSNotificationType.CONNECTION_FACTORY_DESTROYED.toString(), notif.getType());
+      Assert.assertEquals("NewCF", notif.getMessage());
 
       JMSServerControl control = createJMSControl();
 
       control.createConnectionFactory("test", false, false, 0, "invm", "test");
 
       notif = listener.getNotification();
-      assertEquals(JMSNotificationType.CONNECTION_FACTORY_CREATED.toString(), notif.getType());
-      assertEquals("test", notif.getMessage());
+      Assert.assertEquals(JMSNotificationType.CONNECTION_FACTORY_CREATED.toString(), notif.getType());
+      Assert.assertEquals("test", notif.getMessage());
 
       control.destroyConnectionFactory("test");
 
       notif = listener.getNotification();
-      assertEquals(JMSNotificationType.CONNECTION_FACTORY_DESTROYED.toString(), notif.getType());
-      assertEquals("test", notif.getMessage());
+      Assert.assertEquals(JMSNotificationType.CONNECTION_FACTORY_DESTROYED.toString(), notif.getType());
+      Assert.assertEquals("test", notif.getMessage());
    }
 
 
@@ -154,10 +156,10 @@ public class ConnectionFactoryControlTest extends ManagementTestBase
    protected void startServer() throws Exception
    {
       Configuration conf = createDefaultConfig(false)
-         .addConnectorConfiguration("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY))
+         .addConnectorConfiguration("invm", new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY))
          .setSecurityEnabled(false)
          .setJMXManagementEnabled(true)
-         .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY));
+         .addAcceptorConfiguration(new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY));
       server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, true);
       server.start();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSMessagingProxy.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSMessagingProxy.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSMessagingProxy.java
index 617c575dbd..14bbcb89a1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSMessagingProxy.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSMessagingProxy.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
 
 import javax.jms.Message;
 import javax.jms.Queue;
@@ -22,7 +22,7 @@ import javax.jms.QueueRequestor;
 import javax.jms.QueueSession;
 import javax.jms.Session;
 
-import org.apache.activemq.api.jms.management.JMSManagementHelper;
+import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper;
 
 public class JMSMessagingProxy
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java
index 7779dbac4d..558480bab7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -31,37 +31,37 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.api.jms.management.JMSQueueControl;
-import org.apache.activemq.api.jms.management.JMSServerControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQQueue;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.jms.server.management.JMSNotificationType;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.integration.management.ManagementTestBase;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.utils.UUIDGenerator;
-import org.apache.activemq.utils.json.JSONArray;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
+import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.jms.server.management.JMSNotificationType;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
+import org.apache.activemq.artemis.utils.json.JSONArray;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -899,7 +899,7 @@ public class JMSQueueControlTest extends ManagementTestBase
       {
          ClientMessage msg = session.createMessage(true);
 
-         msg.putStringProperty(org.apache.activemq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i));
+         msg.putStringProperty(org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i));
 
          prod1.send(msg);
          if (i < 5)
@@ -980,7 +980,7 @@ public class JMSQueueControlTest extends ManagementTestBase
       {
          ClientMessage msg = session.createMessage(true);
 
-         msg.putStringProperty(org.apache.activemq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i));
+         msg.putStringProperty(org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i));
 
          msg.setUserID(UUIDGenerator.getInstance().generateUUID());
 
@@ -1062,7 +1062,7 @@ public class JMSQueueControlTest extends ManagementTestBase
 
       ClientMessage msg = session.createMessage(true);
 
-      msg.putStringProperty(org.apache.activemq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-1"));
+      msg.putStringProperty(org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-1"));
 
       prod1.send(msg);
       prod2.send(msg);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
index bea7755426..4f57287333 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
 import org.junit.Before;
 import org.junit.After;
 
@@ -24,14 +24,14 @@ import javax.jms.QueueConnection;
 import javax.jms.QueueSession;
 import javax.jms.Session;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.api.jms.management.JMSQueueControl;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQQueue;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java
index 4527f58be9..27e59018a7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -32,31 +32,32 @@ import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.QueueControl;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.management.JMSConnectionInfo;
-import org.apache.activemq.api.jms.management.JMSConsumerInfo;
-import org.apache.activemq.api.jms.management.JMSServerControl;
-import org.apache.activemq.api.jms.management.JMSSessionInfo;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQMessage;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.ra.inflow.ActiveMQActivation;
-import org.apache.activemq.ra.inflow.ActiveMQActivationSpec;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.integration.management.ManagementTestBase;
-import org.apache.activemq.tests.unit.ra.MessageEndpointFactory;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.management.JMSConnectionInfo;
+import org.apache.activemq.artemis.api.jms.management.JMSConsumerInfo;
+import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
+import org.apache.activemq.artemis.api.jms.management.JMSSessionInfo;
+import org.apache.activemq.artemis.tests.unit.ra.BootstrapContext;
+import org.apache.activemq.artemis.tests.unit.ra.MessageEndpointFactory;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivation;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -521,10 +522,10 @@ public class JMSServerControl2Test extends ManagementTestBase
 
          ra = new ActiveMQResourceAdapter();
 
-         ra.setConnectorClassName("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory");
+         ra.setConnectorClassName("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory");
          ra.setUserName("userGlobal");
          ra.setPassword("passwordGlobal");
-         ra.start(new org.apache.activemq.tests.unit.ra.BootstrapContext());
+         ra.start(new BootstrapContext());
          ra.setClientID("my-client-id");
          ra.setUserName("user");
          Connection conn = ra.getDefaultActiveMQConnectionFactory().createConnection();
@@ -608,10 +609,10 @@ public class JMSServerControl2Test extends ManagementTestBase
 
          ra = new ActiveMQResourceAdapter();
 
-         ra.setConnectorClassName("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory");
+         ra.setConnectorClassName("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory");
          ra.setUserName("userGlobal");
          ra.setPassword("passwordGlobal");
-         ra.start(new org.apache.activemq.tests.unit.ra.BootstrapContext());
+         ra.start(new BootstrapContext());
 
          Connection conn = ra.getDefaultActiveMQConnectionFactory().createConnection();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java
similarity index 73%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlRestartTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java
index a7018b0fa3..014c5c115a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
 
 import javax.jms.Connection;
 import javax.jms.Message;
@@ -23,26 +23,26 @@ import javax.jms.QueueRequestor;
 import javax.jms.QueueSession;
 import javax.jms.Session;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.api.jms.management.JMSManagementHelper;
-import org.apache.activemq.api.jms.management.JMSServerControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.JournalType;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.integration.management.ManagementTestBase;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper;
+import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.JournalType;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -70,12 +70,12 @@ public class JMSServerControlRestartTest extends ManagementTestBase
       Object o = UnitTestCase.checkBinding(context, binding);
       Assert.assertTrue(o instanceof Queue);
       Queue queue = (Queue) o;
-      assertEquals(queueName, queue.getQueueName());
+      Assert.assertEquals(queueName, queue.getQueueName());
       checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName));
 
       serverManager.stop();
 
-      checkNoBinding(context, binding);
+      UnitTestCase.checkNoBinding(context, binding);
       checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName));
 
       serverManager = createJMSServer();
@@ -84,7 +84,7 @@ public class JMSServerControlRestartTest extends ManagementTestBase
       o = UnitTestCase.checkBinding(context, binding);
       Assert.assertTrue(o instanceof Queue);
       queue = (Queue) o;
-      assertEquals(queueName, queue.getQueueName());
+      Assert.assertEquals(queueName, queue.getQueueName());
       checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName));
    }
 
@@ -106,18 +106,18 @@ public class JMSServerControlRestartTest extends ManagementTestBase
       Message message = session.createMessage();
       JMSManagementHelper.putOperationInvocation(message, "jms.server", "createQueue", queueName, binding);
       Message reply = requestor.request(message);
-      assertTrue(JMSManagementHelper.hasOperationSucceeded(reply));
+      Assert.assertTrue(JMSManagementHelper.hasOperationSucceeded(reply));
       connection.close();
 
       Object o = UnitTestCase.checkBinding(context, binding);
       Assert.assertTrue(o instanceof Queue);
       Queue queue = (Queue) o;
-      assertEquals(queueName, queue.getQueueName());
+      Assert.assertEquals(queueName, queue.getQueueName());
       checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName));
 
       serverManager.stop();
 
-      checkNoBinding(context, binding);
+      UnitTestCase.checkNoBinding(context, binding);
       checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName));
 
       serverManager = createJMSServer();
@@ -126,7 +126,7 @@ public class JMSServerControlRestartTest extends ManagementTestBase
       o = UnitTestCase.checkBinding(context, binding);
       Assert.assertTrue(o instanceof Queue);
       queue = (Queue) o;
-      assertEquals(queueName, queue.getQueueName());
+      Assert.assertEquals(queueName, queue.getQueueName());
       checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName));
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java
index f89164918b..82a395cd4a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -38,39 +38,39 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.ActiveMQObjectClosedException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.management.AddressControl;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.management.JMSServerControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.postoffice.QueueBinding;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQConnection;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQMessageConsumer;
-import org.apache.activemq.jms.client.ActiveMQQueueConnectionFactory;
-import org.apache.activemq.jms.persistence.JMSStorageManager;
-import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory;
-import org.apache.activemq.jms.persistence.config.PersistedDestination;
-import org.apache.activemq.jms.persistence.config.PersistedBindings;
-import org.apache.activemq.jms.persistence.config.PersistedType;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.integration.management.ManagementTestBase;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.json.JSONArray;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.management.AddressControl;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.postoffice.QueueBinding;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQMessageConsumer;
+import org.apache.activemq.artemis.jms.client.ActiveMQQueueConnectionFactory;
+import org.apache.activemq.artemis.jms.persistence.JMSStorageManager;
+import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory;
+import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination;
+import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings;
+import org.apache.activemq.artemis.jms.persistence.config.PersistedType;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.json.JSONArray;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -273,7 +273,7 @@ public class JMSServerControlTest extends ManagementTestBase
       Assert.assertEquals(queueName, queue.getQueueName());
       QueueBinding queueBinding = (QueueBinding) server.getPostOffice()
          .getBinding(new SimpleString("jms.queue." + queueName));
-      assertFalse(queueBinding.getQueue().isDurable());
+      Assert.assertFalse(queueBinding.getQueue().isDurable());
       checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName));
 
       // queue is not durable => not stored
@@ -320,7 +320,7 @@ public class JMSServerControlTest extends ManagementTestBase
       checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName));
 
       ActiveMQConnectionFactory cf =
-         new ActiveMQConnectionFactory(false, new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+         new ActiveMQConnectionFactory(false, new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
       ActiveMQConnection connection = (ActiveMQConnection) cf.createConnection();
       try
       {
@@ -340,16 +340,16 @@ public class JMSServerControlTest extends ManagementTestBase
          {
             Thread.sleep(100);
          }
-         assertTrue(cons.isClosed());
+         Assert.assertTrue(cons.isClosed());
 
          try
          {
             cons.receive(5000);
-            fail("should throw exception");
+            Assert.fail("should throw exception");
          }
          catch (javax.jms.IllegalStateException e)
          {
-            assertTrue(e.getCause() instanceof ActiveMQObjectClosedException);
+            Assert.assertTrue(e.getCause() instanceof ActiveMQObjectClosedException);
          }
       }
       finally
@@ -376,7 +376,7 @@ public class JMSServerControlTest extends ManagementTestBase
       UnitTestCase.checkBinding(context, queueJNDIBinding);
       checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName));
 
-      ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(false, new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+      ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(false, new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
       ActiveMQConnection connection = (ActiveMQConnection) cf.createConnection();
       connection.start();
       try
@@ -390,11 +390,11 @@ public class JMSServerControlTest extends ManagementTestBase
          try
          {
             control.destroyQueue(queueName, false);
-            fail();
+            Assert.fail();
          }
          catch (Exception e)
          {
-            assertTrue(e.getMessage().startsWith("AMQ119025"));
+            Assert.assertTrue(e.getMessage().startsWith("AMQ119025"));
          }
 
          UnitTestCase.checkBinding(context, queueJNDIBinding);
@@ -402,9 +402,9 @@ public class JMSServerControlTest extends ManagementTestBase
 
          Assert.assertNotNull(fakeJMSStorageManager.destinationMap.get(queueName));
 
-         assertFalse(cons.isClosed());
+         Assert.assertFalse(cons.isClosed());
 
-         assertNotNull(cons.receive(5000));
+         Assert.assertNotNull(cons.receive(5000));
       }
       finally
       {
@@ -431,7 +431,7 @@ public class JMSServerControlTest extends ManagementTestBase
       UnitTestCase.checkBinding(context, topicJNDIBinding);
       checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName));
 
-      ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(false, new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+      ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(false, new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
       ActiveMQConnection connection = (ActiveMQConnection) cf.createConnection();
       connection.start();
       try
@@ -445,18 +445,18 @@ public class JMSServerControlTest extends ManagementTestBase
          try
          {
             control.destroyTopic(topicName, false);
-            fail();
+            Assert.fail();
          }
          catch (Exception e)
          {
-            assertTrue(e.getMessage().startsWith("AMQ119025"));
+            Assert.assertTrue(e.getMessage().startsWith("AMQ119025"));
          }
 
          UnitTestCase.checkBinding(context, topicJNDIBinding);
          checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName));
-         assertFalse(cons.isClosed());
+         Assert.assertFalse(cons.isClosed());
 
-         assertNotNull(cons.receive(5000));
+         Assert.assertNotNull(cons.receive(5000));
       }
       finally
       {
@@ -484,7 +484,7 @@ public class JMSServerControlTest extends ManagementTestBase
       checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName));
 
       ActiveMQConnectionFactory cf =
-         new ActiveMQConnectionFactory(false, new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+         new ActiveMQConnectionFactory(false, new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
       ActiveMQConnection connection = (ActiveMQConnection) cf.createConnection();
       try
       {
@@ -502,16 +502,16 @@ public class JMSServerControlTest extends ManagementTestBase
          {
             Thread.sleep(100);
          }
-         assertTrue(cons.isClosed());
+         Assert.assertTrue(cons.isClosed());
 
          try
          {
             cons.receive(5000);
-            fail("should throw exception");
+            Assert.fail("should throw exception");
          }
          catch (javax.jms.IllegalStateException e)
          {
-            assertTrue(e.getCause() instanceof ActiveMQObjectClosedException);
+            Assert.assertTrue(e.getCause() instanceof ActiveMQObjectClosedException);
          }
       }
       finally
@@ -539,7 +539,7 @@ public class JMSServerControlTest extends ManagementTestBase
       checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName));
 
       ActiveMQConnectionFactory cf =
-         new ActiveMQConnectionFactory(false, new TransportConfiguration(NETTY_CONNECTOR_FACTORY));
+         new ActiveMQConnectionFactory(false, new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY));
       cf.setReconnectAttempts(-1);
       ActiveMQConnection connection = (ActiveMQConnection) cf.createConnection();
       try
@@ -566,11 +566,11 @@ public class JMSServerControlTest extends ManagementTestBase
          try
          {
             cons.receive(5000);
-            fail("should throw exception");
+            Assert.fail("should throw exception");
          }
          catch (javax.jms.IllegalStateException e)
          {
-            assertTrue(e.getCause() instanceof ActiveMQObjectClosedException);
+            Assert.assertTrue(e.getCause() instanceof ActiveMQObjectClosedException);
          }
       }
       finally
@@ -654,7 +654,7 @@ public class JMSServerControlTest extends ManagementTestBase
 
       checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName));
       Topic topic = (Topic) context.lookup(topicJNDIBinding);
-      assertNotNull(topic);
+      Assert.assertNotNull(topic);
       ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(false,
                                                                  new TransportConfiguration(InVMConnectorFactory.class.getName()));
       Connection connection = cf.createConnection();
@@ -665,14 +665,14 @@ public class JMSServerControlTest extends ManagementTestBase
       String topicAddress = ActiveMQDestination.createTopicAddressFromName(topicName).toString();
       AddressControl addressControl = (AddressControl) server.getManagementService()
          .getResource(ResourceNames.CORE_ADDRESS + topicAddress);
-      assertNotNull(addressControl);
+      Assert.assertNotNull(addressControl);
 
-      assertTrue(addressControl.getQueueNames().length > 0);
+      Assert.assertTrue(addressControl.getQueueNames().length > 0);
 
       connection.close();
       control.destroyTopic(topicName);
 
-      assertNull(server.getManagementService().getResource(ResourceNames.CORE_ADDRESS + topicAddress));
+      Assert.assertNull(server.getManagementService().getResource(ResourceNames.CORE_ADDRESS + topicAddress));
       UnitTestCase.checkNoBinding(context, topicJNDIBinding);
       checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName));
 
@@ -693,9 +693,9 @@ public class JMSServerControlTest extends ManagementTestBase
 
       checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName));
       Topic topic = (Topic) context.lookup(topicJNDIBinding);
-      assertNotNull(topic);
+      Assert.assertNotNull(topic);
       ActiveMQConnectionFactory cf =
-         new ActiveMQConnectionFactory(false, new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+         new ActiveMQConnectionFactory(false, new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
       Connection connection = cf.createConnection();
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
       // create a consumer will create a Core queue bound to the topic address
@@ -703,25 +703,25 @@ public class JMSServerControlTest extends ManagementTestBase
 
       JSONArray jsonArray = new JSONArray(control.listAllConsumersAsJSON());
 
-      assertEquals(1 + getNumberOfConsumers(), jsonArray.length());
+      Assert.assertEquals(1 + getNumberOfConsumers(), jsonArray.length());
 
       cons.close();
 
       jsonArray = new JSONArray(control.listAllConsumersAsJSON());
 
-      assertEquals(getNumberOfConsumers(), jsonArray.length());
+      Assert.assertEquals(getNumberOfConsumers(), jsonArray.length());
 
       String topicAddress = ActiveMQDestination.createTopicAddressFromName(topicName).toString();
       AddressControl addressControl = (AddressControl) server.getManagementService()
          .getResource(ResourceNames.CORE_ADDRESS + topicAddress);
-      assertNotNull(addressControl);
+      Assert.assertNotNull(addressControl);
 
-      assertTrue(addressControl.getQueueNames().length > 0);
+      Assert.assertTrue(addressControl.getQueueNames().length > 0);
 
       connection.close();
       control.destroyTopic(topicName);
 
-      assertNull(server.getManagementService().getResource(ResourceNames.CORE_ADDRESS + topicAddress));
+      Assert.assertNull(server.getManagementService().getResource(ResourceNames.CORE_ADDRESS + topicAddress));
       UnitTestCase.checkNoBinding(context, topicJNDIBinding);
       checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName));
 
@@ -753,7 +753,7 @@ public class JMSServerControlTest extends ManagementTestBase
    {
       server.getConfiguration()
          .getConnectorConfigurations()
-         .put("tst", new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+         .put("tst", new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
 
       doCreateConnectionFactory(new ConnectionFactoryCreator()
       {
@@ -811,35 +811,35 @@ public class JMSServerControlTest extends ManagementTestBase
 
       ActiveMQQueueConnectionFactory cf = (ActiveMQQueueConnectionFactory) context.lookup("tst");
 
-      assertEquals(true, cf.isHA());
-      assertEquals("tst", cf.getClientID());
-      assertEquals(1, cf.getClientFailureCheckPeriod());
-      assertEquals(1, cf.getConnectionTTL());
-      assertEquals(1, cf.getCallTimeout());
-      assertEquals(1, cf.getCallFailoverTimeout());
-      assertEquals(1, cf.getMinLargeMessageSize());
-      assertEquals(true, cf.isCompressLargeMessage());
-      assertEquals(1, cf.getConsumerWindowSize());
-      assertEquals(1, cf.getConfirmationWindowSize());
-      assertEquals(1, cf.getProducerWindowSize());
-      assertEquals(1, cf.getProducerMaxRate());
-      assertEquals(true, cf.isBlockOnAcknowledge());
-      assertEquals(true, cf.isBlockOnDurableSend());
-      assertEquals(true, cf.isBlockOnNonDurableSend());
-      assertEquals(true, cf.isAutoGroup());
-      assertEquals(true, cf.isPreAcknowledge());
-      assertEquals(ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, cf.getConnectionLoadBalancingPolicyClassName());
-      assertEquals(1, cf.getTransactionBatchSize());
-      assertEquals(1, cf.getDupsOKBatchSize());
-      assertEquals(true, cf.isUseGlobalPools());
-      assertEquals(1, cf.getScheduledThreadPoolMaxSize());
-      assertEquals(1, cf.getThreadPoolMaxSize());
-      assertEquals(1, cf.getRetryInterval());
-      assertEquals(1.0, cf.getRetryIntervalMultiplier(), 0.000001);
-      assertEquals(1, cf.getMaxRetryInterval());
-      assertEquals(1, cf.getReconnectAttempts());
-      assertEquals(true, cf.isFailoverOnInitialConnection());
-      assertEquals("tst", cf.getGroupID());
+      Assert.assertEquals(true, cf.isHA());
+      Assert.assertEquals("tst", cf.getClientID());
+      Assert.assertEquals(1, cf.getClientFailureCheckPeriod());
+      Assert.assertEquals(1, cf.getConnectionTTL());
+      Assert.assertEquals(1, cf.getCallTimeout());
+      Assert.assertEquals(1, cf.getCallFailoverTimeout());
+      Assert.assertEquals(1, cf.getMinLargeMessageSize());
+      Assert.assertEquals(true, cf.isCompressLargeMessage());
+      Assert.assertEquals(1, cf.getConsumerWindowSize());
+      Assert.assertEquals(1, cf.getConfirmationWindowSize());
+      Assert.assertEquals(1, cf.getProducerWindowSize());
+      Assert.assertEquals(1, cf.getProducerMaxRate());
+      Assert.assertEquals(true, cf.isBlockOnAcknowledge());
+      Assert.assertEquals(true, cf.isBlockOnDurableSend());
+      Assert.assertEquals(true, cf.isBlockOnNonDurableSend());
+      Assert.assertEquals(true, cf.isAutoGroup());
+      Assert.assertEquals(true, cf.isPreAcknowledge());
+      Assert.assertEquals(ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, cf.getConnectionLoadBalancingPolicyClassName());
+      Assert.assertEquals(1, cf.getTransactionBatchSize());
+      Assert.assertEquals(1, cf.getDupsOKBatchSize());
+      Assert.assertEquals(true, cf.isUseGlobalPools());
+      Assert.assertEquals(1, cf.getScheduledThreadPoolMaxSize());
+      Assert.assertEquals(1, cf.getThreadPoolMaxSize());
+      Assert.assertEquals(1, cf.getRetryInterval());
+      Assert.assertEquals(1.0, cf.getRetryIntervalMultiplier(), 0.000001);
+      Assert.assertEquals(1, cf.getMaxRetryInterval());
+      Assert.assertEquals(1, cf.getReconnectAttempts());
+      Assert.assertEquals(true, cf.isFailoverOnInitialConnection());
+      Assert.assertEquals("tst", cf.getGroupID());
 
       stopServer();
 
@@ -849,51 +849,51 @@ public class JMSServerControlTest extends ManagementTestBase
 
       cf = (ActiveMQQueueConnectionFactory) context.lookup("tst");
 
-      assertEquals(true, cf.isHA());
-      assertEquals("tst", cf.getClientID());
-      assertEquals(1, cf.getClientFailureCheckPeriod());
-      assertEquals(1, cf.getConnectionTTL());
-      assertEquals(1, cf.getCallTimeout());
-      assertEquals(1, cf.getMinLargeMessageSize());
-      assertEquals(true, cf.isCompressLargeMessage());
-      assertEquals(1, cf.getConsumerWindowSize());
-      assertEquals(1, cf.getConfirmationWindowSize());
-      assertEquals(1, cf.getProducerWindowSize());
-      assertEquals(1, cf.getProducerMaxRate());
-      assertEquals(true, cf.isBlockOnAcknowledge());
-      assertEquals(true, cf.isBlockOnDurableSend());
-      assertEquals(true, cf.isBlockOnNonDurableSend());
-      assertEquals(true, cf.isAutoGroup());
-      assertEquals(true, cf.isPreAcknowledge());
-      assertEquals(ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, cf.getConnectionLoadBalancingPolicyClassName());
-      assertEquals(1, cf.getTransactionBatchSize());
-      assertEquals(1, cf.getDupsOKBatchSize());
-      assertEquals(true, cf.isUseGlobalPools());
-      assertEquals(1, cf.getScheduledThreadPoolMaxSize());
-      assertEquals(1, cf.getThreadPoolMaxSize());
-      assertEquals(1, cf.getRetryInterval());
-      assertEquals(1.0, cf.getRetryIntervalMultiplier(), 0.000001);
-      assertEquals(1, cf.getMaxRetryInterval());
-      assertEquals(1, cf.getReconnectAttempts());
-      assertEquals(true, cf.isFailoverOnInitialConnection());
-      assertEquals("tst", cf.getGroupID());
+      Assert.assertEquals(true, cf.isHA());
+      Assert.assertEquals("tst", cf.getClientID());
+      Assert.assertEquals(1, cf.getClientFailureCheckPeriod());
+      Assert.assertEquals(1, cf.getConnectionTTL());
+      Assert.assertEquals(1, cf.getCallTimeout());
+      Assert.assertEquals(1, cf.getMinLargeMessageSize());
+      Assert.assertEquals(true, cf.isCompressLargeMessage());
+      Assert.assertEquals(1, cf.getConsumerWindowSize());
+      Assert.assertEquals(1, cf.getConfirmationWindowSize());
+      Assert.assertEquals(1, cf.getProducerWindowSize());
+      Assert.assertEquals(1, cf.getProducerMaxRate());
+      Assert.assertEquals(true, cf.isBlockOnAcknowledge());
+      Assert.assertEquals(true, cf.isBlockOnDurableSend());
+      Assert.assertEquals(true, cf.isBlockOnNonDurableSend());
+      Assert.assertEquals(true, cf.isAutoGroup());
+      Assert.assertEquals(true, cf.isPreAcknowledge());
+      Assert.assertEquals(ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, cf.getConnectionLoadBalancingPolicyClassName());
+      Assert.assertEquals(1, cf.getTransactionBatchSize());
+      Assert.assertEquals(1, cf.getDupsOKBatchSize());
+      Assert.assertEquals(true, cf.isUseGlobalPools());
+      Assert.assertEquals(1, cf.getScheduledThreadPoolMaxSize());
+      Assert.assertEquals(1, cf.getThreadPoolMaxSize());
+      Assert.assertEquals(1, cf.getRetryInterval());
+      Assert.assertEquals(1.0, cf.getRetryIntervalMultiplier(), 0.000001);
+      Assert.assertEquals(1, cf.getMaxRetryInterval());
+      Assert.assertEquals(1, cf.getReconnectAttempts());
+      Assert.assertEquals(true, cf.isFailoverOnInitialConnection());
+      Assert.assertEquals("tst", cf.getGroupID());
 
       control.destroyConnectionFactory("test");
 
       ObjectNameBuilder nameBuilder = ObjectNameBuilder.create(ActiveMQDefaultConfiguration.getDefaultJmxDomain());
-      assertFalse(mbeanServer.isRegistered(nameBuilder.getConnectionFactoryObjectName("test")));
+      Assert.assertFalse(mbeanServer.isRegistered(nameBuilder.getConnectionFactoryObjectName("test")));
 
       stopServer();
 
       startServer();
 
-      assertFalse(mbeanServer.isRegistered(nameBuilder.getConnectionFactoryObjectName("test")));
+      Assert.assertFalse(mbeanServer.isRegistered(nameBuilder.getConnectionFactoryObjectName("test")));
 
 
       try
       {
          cf = (ActiveMQQueueConnectionFactory) context.lookup("tst");
-         fail("Failure expected");
+         Assert.fail("Failure expected");
       }
       catch (NamingException e)
       {
@@ -916,7 +916,7 @@ public class JMSServerControlTest extends ManagementTestBase
 
       control.destroyConnectionFactory("test-cf");
 
-      assertTrue(control.getConnectionFactoryNames().length == 0);
+      Assert.assertTrue(control.getConnectionFactoryNames().length == 0);
    }
 
    @Test
@@ -930,7 +930,7 @@ public class JMSServerControlTest extends ManagementTestBase
 
       server.getConfiguration()
          .getConnectorConfigurations()
-         .put("tst", new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+         .put("tst", new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
 
       control.createConnectionFactory(cfName, false, false, 3, "tst", cfJNDIBinding);
 
@@ -971,7 +971,7 @@ public class JMSServerControlTest extends ManagementTestBase
 
       server.getConfiguration()
          .getConnectorConfigurations()
-         .put("tst", new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+         .put("tst", new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
 
       control.createConnectionFactory(cfName, false, false, 3, "tst", cfJNDIBinding);
 
@@ -1024,7 +1024,7 @@ public class JMSServerControlTest extends ManagementTestBase
          failed = true;
       }
 
-      assertTrue(failed);
+      Assert.assertTrue(failed);
 
       System.out.println(control.closeConnectionWithClientID("someID"));
 
@@ -1043,7 +1043,7 @@ public class JMSServerControlTest extends ManagementTestBase
          failed = true;
       }
 
-      assertTrue(failed);
+      Assert.assertTrue(failed);
    }
 
    // Package protected ---------------------------------------------
@@ -1066,10 +1066,10 @@ public class JMSServerControlTest extends ManagementTestBase
    {
       Configuration conf = createBasicConfig()
          .setPersistenceEnabled(true)
-         .addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY))
-         .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY))
-         .addConnectorConfiguration("netty", new TransportConfiguration(NETTY_CONNECTOR_FACTORY))
-         .addConnectorConfiguration("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+         .addAcceptorConfiguration(new TransportConfiguration(UnitTestCase.NETTY_ACCEPTOR_FACTORY))
+         .addAcceptorConfiguration(new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY))
+         .addConnectorConfiguration("netty", new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY))
+         .addConnectorConfiguration("invm", new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
 
       server = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, true));
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
index 3ee9d9709c..bab10427ba 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.After;
 
@@ -24,16 +25,16 @@ import javax.jms.QueueConnection;
 import javax.jms.QueueSession;
 import javax.jms.Session;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.api.jms.management.JMSServerControl;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQQueue;
-import org.apache.activemq.jms.client.ActiveMQQueueConnectionFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
+import org.apache.activemq.artemis.jms.client.ActiveMQQueueConnectionFactory;
 
 public class JMSServerControlUsingJMSTest extends JMSServerControlTest
 {
@@ -103,35 +104,35 @@ public class JMSServerControlUsingJMSTest extends JMSServerControlTest
 
       ActiveMQQueueConnectionFactory cf = (ActiveMQQueueConnectionFactory)context.lookup("tst");
 
-      assertEquals(true, cf.isHA());
-      assertEquals("tst", cf.getClientID());
-      assertEquals(1, cf.getClientFailureCheckPeriod());
-      assertEquals(1, cf.getConnectionTTL());
-      assertEquals(1, cf.getCallTimeout());
-      assertEquals(1, cf.getCallFailoverTimeout());
-      assertEquals(1, cf.getMinLargeMessageSize());
-      assertEquals(true, cf.isCompressLargeMessage());
-      assertEquals(1, cf.getConsumerWindowSize());
-      assertEquals(1, cf.getConfirmationWindowSize());
-      assertEquals(1, cf.getProducerWindowSize());
-      assertEquals(1, cf.getProducerMaxRate());
-      assertEquals(true, cf.isBlockOnAcknowledge());
-      assertEquals(true, cf.isBlockOnDurableSend());
-      assertEquals(true, cf.isBlockOnNonDurableSend());
-      assertEquals(true, cf.isAutoGroup());
-      assertEquals(true, cf.isPreAcknowledge());
-      assertEquals(ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, cf.getConnectionLoadBalancingPolicyClassName());
-      assertEquals(1, cf.getTransactionBatchSize());
-      assertEquals(1, cf.getDupsOKBatchSize());
-      assertEquals(true, cf.isUseGlobalPools());
-      assertEquals(1, cf.getScheduledThreadPoolMaxSize());
-      assertEquals(1, cf.getThreadPoolMaxSize());
-      assertEquals(1, cf.getRetryInterval());
-      assertEquals(1.0, cf.getRetryIntervalMultiplier(), 0.000001);
-      assertEquals(1, cf.getMaxRetryInterval());
-      assertEquals(1, cf.getReconnectAttempts());
-      assertEquals(true, cf.isFailoverOnInitialConnection());
-      assertEquals("tst", cf.getGroupID());
+      Assert.assertEquals(true, cf.isHA());
+      Assert.assertEquals("tst", cf.getClientID());
+      Assert.assertEquals(1, cf.getClientFailureCheckPeriod());
+      Assert.assertEquals(1, cf.getConnectionTTL());
+      Assert.assertEquals(1, cf.getCallTimeout());
+      Assert.assertEquals(1, cf.getCallFailoverTimeout());
+      Assert.assertEquals(1, cf.getMinLargeMessageSize());
+      Assert.assertEquals(true, cf.isCompressLargeMessage());
+      Assert.assertEquals(1, cf.getConsumerWindowSize());
+      Assert.assertEquals(1, cf.getConfirmationWindowSize());
+      Assert.assertEquals(1, cf.getProducerWindowSize());
+      Assert.assertEquals(1, cf.getProducerMaxRate());
+      Assert.assertEquals(true, cf.isBlockOnAcknowledge());
+      Assert.assertEquals(true, cf.isBlockOnDurableSend());
+      Assert.assertEquals(true, cf.isBlockOnNonDurableSend());
+      Assert.assertEquals(true, cf.isAutoGroup());
+      Assert.assertEquals(true, cf.isPreAcknowledge());
+      Assert.assertEquals(ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, cf.getConnectionLoadBalancingPolicyClassName());
+      Assert.assertEquals(1, cf.getTransactionBatchSize());
+      Assert.assertEquals(1, cf.getDupsOKBatchSize());
+      Assert.assertEquals(true, cf.isUseGlobalPools());
+      Assert.assertEquals(1, cf.getScheduledThreadPoolMaxSize());
+      Assert.assertEquals(1, cf.getThreadPoolMaxSize());
+      Assert.assertEquals(1, cf.getRetryInterval());
+      Assert.assertEquals(1.0, cf.getRetryIntervalMultiplier(), 0.000001);
+      Assert.assertEquals(1, cf.getMaxRetryInterval());
+      Assert.assertEquals(1, cf.getReconnectAttempts());
+      Assert.assertEquals(true, cf.isFailoverOnInitialConnection());
+      Assert.assertEquals("tst", cf.getGroupID());
 
    }
    // Constructors --------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java
index c7e5b11471..72347ade5d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -35,26 +35,26 @@ import javax.management.NotificationListener;
 import java.util.Collection;
 import java.util.Set;
 
-import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.integration.cluster.failover.FailoverTestBase;
 import org.junit.Assert;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.client.SessionFailureListener;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.client.impl.Topology;
-import org.apache.activemq.core.client.impl.TopologyMemberImpl;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.cluster.ClusterConnection;
-import org.apache.activemq.core.server.cluster.ClusterManager;
-import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl;
-import org.apache.activemq.jms.client.ActiveMQConnection;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.activemq.tests.integration.cluster.failover.FailoverTestBase;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.client.impl.Topology;
+import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.cluster.ClusterConnection;
+import org.apache.activemq.artemis.core.server.cluster.ClusterManager;
+import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionImpl;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class JMSUtil
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/NullInitialContext.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/NullInitialContext.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/NullInitialContext.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/NullInitialContext.java
index f38cf6ed89..42c9f48ab3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/NullInitialContext.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/NullInitialContext.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
 
 import javax.naming.InitialContext;
 import javax.naming.Name;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlClusterTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlClusterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlClusterTest.java
index 1122c0c08d..d2f7d64814 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlClusterTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
 import org.junit.Before;
 import org.junit.After;
 
 import org.junit.Test;
 
-import org.apache.activemq.api.jms.management.TopicControl;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.util.JMSClusteredTestBase;
+import org.apache.activemq.artemis.api.jms.management.TopicControl;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.util.JMSClusteredTestBase;
 
 import javax.jms.Connection;
 import javax.jms.Session;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java
index 73abf099de..ca35dd4558 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
 
 import javax.jms.Connection;
 import javax.jms.Message;
@@ -30,28 +30,28 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.management.JMSServerControl;
-import org.apache.activemq.api.jms.management.SubscriptionInfo;
-import org.apache.activemq.api.jms.management.TopicControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQTopic;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.jms.server.management.JMSNotificationType;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.integration.management.ManagementTestBase;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.utils.json.JSONArray;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
+import org.apache.activemq.artemis.api.jms.management.SubscriptionInfo;
+import org.apache.activemq.artemis.api.jms.management.TopicControl;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQTopic;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.jms.server.management.JMSNotificationType;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.json.JSONArray;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -91,7 +91,7 @@ public class TopicControlTest extends ManagementTestBase
       Assert.assertEquals(topic.getAddress(), topicControl.getAddress());
       Assert.assertEquals(topic.isTemporary(), topicControl.isTemporary());
       Object[] bindings = topicControl.getRegistryBindings();
-      assertEquals(1, bindings.length);
+      Assert.assertEquals(1, bindings.length);
       Assert.assertEquals(topicBinding, bindings[0]);
    }
 
@@ -166,7 +166,7 @@ public class TopicControlTest extends ManagementTestBase
       System.out.println("Json: " + json);
       JSONArray jsonArray = new JSONArray(json);
 
-      assertEquals(3, jsonArray.length());
+      Assert.assertEquals(3, jsonArray.length());
 
       connection_1.close();
       connection_2.close();
@@ -358,8 +358,8 @@ public class TopicControlTest extends ManagementTestBase
       TextMessage msg1 = sess.createTextMessage("tst1");
       prod.send(msg1);
 
-      assertNotNull(durableSubscriber_1.receive(5000));
-      assertNotNull(durableSubscriber_2.receive(5000));
+      Assert.assertNotNull(durableSubscriber_1.receive(5000));
+      Assert.assertNotNull(durableSubscriber_2.receive(5000));
 
       connection_1.close();
       connection_2.close();
@@ -512,11 +512,11 @@ public class TopicControlTest extends ManagementTestBase
 
       TopicControl topicControl = createManagementControl();
 
-      assertEquals(0, topicControl.getDeliveringCount());
+      Assert.assertEquals(0, topicControl.getDeliveringCount());
 
       JMSUtil.sendMessages(topic, 2);
 
-      assertEquals(0, topicControl.getDeliveringCount());
+      Assert.assertEquals(0, topicControl.getDeliveringCount());
 
       connection_1.start();
       connection_2.start();
@@ -528,21 +528,21 @@ public class TopicControlTest extends ManagementTestBase
       for (int i = 0; i < 2; i++)
       {
          msg_1 = cons_1.receive(5000);
-         assertNotNull(msg_1);
+         Assert.assertNotNull(msg_1);
          msg_2 = cons_2.receive(5000);
-         assertNotNull(msg_2);
+         Assert.assertNotNull(msg_2);
          msg_3 = cons_3.receive(5000);
-         assertNotNull(msg_3);
+         Assert.assertNotNull(msg_3);
       }
 
-      assertEquals(3 * 2, topicControl.getDeliveringCount());
+      Assert.assertEquals(3 * 2, topicControl.getDeliveringCount());
 
       msg_1.acknowledge();
-      assertEquals(2 * 2, topicControl.getDeliveringCount());
+      Assert.assertEquals(2 * 2, topicControl.getDeliveringCount());
       msg_2.acknowledge();
-      assertEquals(1 * 2, topicControl.getDeliveringCount());
+      Assert.assertEquals(1 * 2, topicControl.getDeliveringCount());
       msg_3.acknowledge();
-      assertEquals(0, topicControl.getDeliveringCount());
+      Assert.assertEquals(0, topicControl.getDeliveringCount());
 
       connection_1.close();
       connection_2.close();
@@ -565,28 +565,28 @@ public class TopicControlTest extends ManagementTestBase
 
       Notification notif = listener.getNotification();
 
-      assertEquals(JMSNotificationType.TOPIC_CREATED.toString(), notif.getType());
-      assertEquals(testTopicName, notif.getMessage());
+      Assert.assertEquals(JMSNotificationType.TOPIC_CREATED.toString(), notif.getType());
+      Assert.assertEquals(testTopicName, notif.getMessage());
 
       this.serverManager.destroyTopic(testTopicName);
 
       notif = listener.getNotification();
-      assertEquals(JMSNotificationType.TOPIC_DESTROYED.toString(), notif.getType());
-      assertEquals(testTopicName, notif.getMessage());
+      Assert.assertEquals(JMSNotificationType.TOPIC_DESTROYED.toString(), notif.getType());
+      Assert.assertEquals(testTopicName, notif.getMessage());
 
       JMSServerControl control = ManagementControlHelper.createJMSServerControl(mbeanServer);
 
       control.createTopic(testTopicName);
 
       notif = listener.getNotification();
-      assertEquals(JMSNotificationType.TOPIC_CREATED.toString(), notif.getType());
-      assertEquals(testTopicName, notif.getMessage());
+      Assert.assertEquals(JMSNotificationType.TOPIC_CREATED.toString(), notif.getType());
+      Assert.assertEquals(testTopicName, notif.getMessage());
 
       control.destroyTopic(testTopicName);
 
       notif = listener.getNotification();
-      assertEquals(JMSNotificationType.TOPIC_DESTROYED.toString(), notif.getType());
-      assertEquals(testTopicName, notif.getMessage());
+      Assert.assertEquals(JMSNotificationType.TOPIC_DESTROYED.toString(), notif.getType());
+      Assert.assertEquals(testTopicName, notif.getMessage());
    }
 
    // Package protected ---------------------------------------------
@@ -600,7 +600,7 @@ public class TopicControlTest extends ManagementTestBase
       super.setUp();
 
       Configuration conf = createBasicConfig()
-         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory"));
+         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory"));
       server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, false);
       server.start();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
index a9d1d12802..bca3eeab02 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.jms.server.management;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
+package org.apache.activemq.artemis.tests.integration.jms.server.management;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
 import org.junit.Before;
 import org.junit.After;
 
 import org.junit.Test;
 
-import static org.apache.activemq.tests.util.RandomUtil.randomString;
+import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString;
 
 import javax.jms.Connection;
 import javax.jms.Message;
@@ -33,22 +34,21 @@ import javax.jms.TopicSubscriber;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQQueue;
-import org.apache.activemq.jms.client.ActiveMQTopic;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.integration.management.ManagementTestBase;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
+import org.apache.activemq.artemis.jms.client.ActiveMQTopic;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class TopicControlUsingJMSTest extends ManagementTestBase
 {
@@ -444,7 +444,7 @@ public class TopicControlUsingJMSTest extends ManagementTestBase
       super.setUp();
 
       Configuration conf = createBasicConfig()
-         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory"));
+         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory"));
       server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, false);
       server.start();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java
similarity index 80%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOImportExportTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java
index bd58f42d67..bba40ffe63 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOImportExportTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
 
 import java.io.File;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
 import org.junit.BeforeClass;
 
 public class AIOImportExportTest extends NIOImportExportTest
@@ -35,7 +36,7 @@ public class AIOImportExportTest extends NIOImportExportTest
    {
       File file = new File(getTestDir());
 
-      deleteDirectory(file);
+      UnitTestCase.deleteDirectory(file);
 
       file.mkdir();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java
similarity index 79%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalCompactTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java
index 526129777e..f71326703a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalCompactTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
 
 import java.io.File;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.core.journal.impl.JournalConstants;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.JournalConstants;
 import org.junit.BeforeClass;
 
 public class AIOJournalCompactTest extends NIOJournalCompactTest
@@ -36,7 +37,7 @@ public class AIOJournalCompactTest extends NIOJournalCompactTest
    {
       File file = new File(getTestDir());
 
-      deleteDirectory(file);
+      UnitTestCase.deleteDirectory(file);
 
       file.mkdir();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalImplTest.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalImplTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalImplTest.java
index 8158156835..47f7e5e1bd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalImplTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalImplTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
 import java.io.File;
 
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.core.journal.impl.JournalConstants;
-import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestUnit;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.JournalConstants;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestUnit;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOSequentialFileFactoryTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOSequentialFileFactoryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOSequentialFileFactoryTest.java
index 3c4a1e69aa..0b81b46f5d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOSequentialFileFactoryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOSequentialFileFactoryTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
 import java.nio.ByteBuffer;
 
-import org.apache.activemq.core.journal.SequentialFile;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.SequentialFileFactoryTestBase;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.SequentialFileFactoryTestBase;
+import org.apache.activemq.artemis.core.journal.SequentialFile;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java
index 68092d6393..8c70ae827c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.core.journal.EncodingSupport;
-import org.apache.activemq.core.journal.IOCompletion;
-import org.apache.activemq.core.journal.Journal;
-import org.apache.activemq.core.journal.LoaderCallback;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.DataConstants;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.EncodingSupport;
+import org.apache.activemq.artemis.core.journal.IOCompletion;
+import org.apache.activemq.artemis.core.journal.Journal;
+import org.apache.activemq.artemis.core.journal.LoaderCallback;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.utils.DataConstants;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOBufferedJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java
similarity index 78%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOBufferedJournalCompactTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java
index 0c3ad6d19b..1e358f69ab 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOBufferedJournalCompactTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
 
 import java.io.File;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
 
 public class NIOBufferedJournalCompactTest extends NIOJournalCompactTest
 {
@@ -29,7 +30,7 @@ public class NIOBufferedJournalCompactTest extends NIOJournalCompactTest
    {
       File file = new File(getTestDir());
 
-      deleteDirectory(file);
+      UnitTestCase.deleteDirectory(file);
 
       file.mkdir();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOImportExportTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java
index f024af1e6e..a31ead76e5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOImportExportTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java
@@ -14,31 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.After;
 
 import org.junit.Test;
 
 import java.io.File;
 
-import org.apache.activemq.core.journal.EncodingSupport;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.SimpleEncoding;
+import org.apache.activemq.artemis.core.journal.EncodingSupport;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
 
 public class NIOImportExportTest extends JournalImplTestBase
 {
 
    /* (non-Javadoc)
-    * @see org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory()
+    * @see JournalImplTestBase#getFileFactory()
     */
    @Override
    protected SequentialFileFactory getFileFactory() throws Exception
    {
       File file = new File(getTestDir());
 
-      deleteDirectory(file);
+      UnitTestCase.deleteDirectory(file);
 
       file.mkdir();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalCompactTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
index 5c6f86a079..64edd8259d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalCompactTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -30,29 +30,29 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.core.Pair;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.journal.IOAsyncTask;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFile;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AbstractJournalUpdateTask;
-import org.apache.activemq.core.journal.impl.JournalCompactor;
-import org.apache.activemq.core.journal.impl.JournalFile;
-import org.apache.activemq.core.journal.impl.JournalFileImpl;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.SimpleEncoding;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.tools.ExportJournal;
-import org.apache.activemq.utils.IDGenerator;
-import org.apache.activemq.utils.OrderedExecutorFactory;
-import org.apache.activemq.utils.SimpleIDGenerator;
+import org.apache.activemq.artemis.api.core.Pair;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.journal.IOAsyncTask;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFile;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AbstractJournalUpdateTask;
+import org.apache.activemq.artemis.core.journal.impl.JournalCompactor;
+import org.apache.activemq.artemis.core.journal.impl.JournalFile;
+import org.apache.activemq.artemis.core.journal.impl.JournalFileImpl;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tools.ExportJournal;
+import org.apache.activemq.artemis.utils.IDGenerator;
+import org.apache.activemq.artemis.utils.OrderedExecutorFactory;
+import org.apache.activemq.artemis.utils.SimpleIDGenerator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java
similarity index 74%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalImplTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java
index 6582ca6c91..660b9d55c9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalImplTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
 
 import java.io.File;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestUnit;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestUnit;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
 
 public class NIOJournalImplTest extends JournalImplTestUnit
 {
@@ -34,7 +35,7 @@ public class NIOJournalImplTest extends JournalImplTestUnit
 
       NIOJournalImplTest.log.debug("deleting directory " + getTestDir());
 
-      deleteDirectory(file);
+      UnitTestCase.deleteDirectory(file);
 
       file.mkdir();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONoBufferJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIONoBufferJournalImplTest.java
similarity index 79%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONoBufferJournalImplTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIONoBufferJournalImplTest.java
index f5473083ea..1392a4d722 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONoBufferJournalImplTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIONoBufferJournalImplTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
 
 import java.io.File;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestUnit;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestUnit;
 
 public class NIONoBufferJournalImplTest extends JournalImplTestUnit
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java
similarity index 77%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java
index b8beb09b3c..a2df0a4a8b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.SequentialFileFactoryTestBase;
+package org.apache.activemq.artemis.tests.integration.journal;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.SequentialFileFactoryTestBase;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
 
 public class NIONonBufferedSequentialFileFactoryTest extends SequentialFileFactoryTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOSequentialFileFactoryTest.java
similarity index 77%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOSequentialFileFactoryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOSequentialFileFactoryTest.java
index e6ba3d72f0..b4e8b36745 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOSequentialFileFactoryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOSequentialFileFactoryTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.SequentialFileFactoryTestBase;
+package org.apache.activemq.artemis.tests.integration.journal;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.SequentialFileFactoryTestBase;
 
 public class NIOSequentialFileFactoryTest extends SequentialFileFactoryTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/OldFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/OldFormatTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/OldFormatTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/OldFormatTest.java
index e0925fdf16..6dcee4ccb7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/OldFormatTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/OldFormatTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
 
 import java.nio.ByteBuffer;
 
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFile;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase;
-import org.apache.activemq.utils.DataConstants;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFile;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase;
+import org.apache.activemq.artemis.utils.DataConstants;
 import org.junit.Test;
 
 public class OldFormatTest extends JournalImplTestBase
@@ -138,7 +138,7 @@ public class OldFormatTest extends JournalImplTestBase
    }
 
    /* (non-Javadoc)
-    * @see org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory()
+    * @see JournalImplTestBase#getFileFactory()
     */
    @Override
    protected SequentialFileFactory getFileFactory() throws Exception
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/ValidateTransactionHealthTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
index f984c959f3..e1a916075b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/ValidateTransactionHealthTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.journal;
+package org.apache.activemq.artemis.tests.integration.journal;
 import java.io.File;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.journal.LoaderCallback;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.core.journal.impl.JournalConstants;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.tests.util.SpawnedVMSupport;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.journal.LoaderCallback;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.JournalConstants;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -139,11 +139,11 @@ public class ValidateTransactionHealthTest extends UnitTestCase
             if (externalProcess)
             {
                Process process = SpawnedVMSupport.spawnVM(ValidateTransactionHealthTest.class.getCanonicalName(),
-                                                          type,
-                                                          journalDir,
-                                                          Long.toString(numberOfRecords),
-                                                          Integer.toString(transactionSize),
-                                                          Integer.toString(numberOfThreads));
+                       type,
+                       journalDir,
+                       Long.toString(numberOfRecords),
+                       Integer.toString(transactionSize),
+                       Integer.toString(numberOfThreads));
                process.waitFor();
                Assert.assertEquals(ValidateTransactionHealthTest.OK, process.exitValue());
             }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
index 6d8f84ab63..801fce69a8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.largemessage;
+package org.apache.activemq.artemis.tests.integration.largemessage;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
@@ -27,25 +27,25 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
-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.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.DataConstants;
-import org.apache.activemq.utils.DeflaterReader;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.DataConstants;
+import org.apache.activemq.artemis.utils.DeflaterReader;
 import org.junit.Assert;
 
 public abstract class LargeMessageTestBase extends ServiceTestBase
@@ -529,7 +529,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase
     * @param producer
     * @throws FileNotFoundException
     * @throws IOException
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    private void sendMessages(final int numberOfMessages,
                              final long numberOfBytes,
@@ -616,7 +616,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase
     * @param session
     * @param queueToRead
     * @param numberOfBytes
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     * @throws FileNotFoundException
     * @throws IOException
     */
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/ServerLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
similarity index 78%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/ServerLargeMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
index adec7607d3..e2c1114f55 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/ServerLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.largemessage;
+package org.apache.activemq.artemis.tests.integration.largemessage;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.persistence.impl.journal.LargeServerMessageImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java
index dde9bc2427..a89d6152ed 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
-import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.integration.SimpleNotificationService;
 import org.junit.Test;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.AcceptorControl;
-import org.apache.activemq.api.core.management.CoreNotificationType;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.management.Notification;
-import org.apache.activemq.tests.integration.SimpleNotificationService;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.AcceptorControl;
+import org.apache.activemq.artemis.api.core.management.CoreNotificationType;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.management.Notification;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class AcceptorControlTest extends ManagementTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlUsingCoreTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java
index 13d33de248..9b600a499c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
 import org.junit.Test;
 
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.AcceptorControl;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.AcceptorControl;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 
 public class AcceptorControlUsingCoreTest extends AcceptorControlTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ActiveMQServerControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index 316e8a4811..75fe771221 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -14,44 +14,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.AddressSettingsInfo;
-import org.apache.activemq.api.core.management.BridgeControl;
-import org.apache.activemq.api.core.management.DivertControl;
-import org.apache.activemq.api.core.management.ActiveMQServerControl;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.core.management.QueueControl;
-import org.apache.activemq.api.core.management.RoleInfo;
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.messagecounter.impl.MessageCounterManagerImpl;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.impl.SlowConsumerPolicy;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UUIDGenerator;
-import org.apache.activemq.utils.json.JSONArray;
-import org.apache.activemq.utils.json.JSONObject;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.AddressSettingsInfo;
+import org.apache.activemq.artemis.api.core.management.BridgeControl;
+import org.apache.activemq.artemis.api.core.management.DivertControl;
+import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.api.core.management.RoleInfo;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterManagerImpl;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
+import org.apache.activemq.artemis.utils.json.JSONArray;
+import org.apache.activemq.artemis.utils.json.JSONObject;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ActiveMQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
index 5bcd5dda0f..7c664d493f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.ActiveMQServerControl;
-import org.apache.activemq.api.core.management.Parameter;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
+import org.apache.activemq.artemis.api.core.management.Parameter;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
index 3e14672b29..8622f678ca 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
@@ -14,36 +14,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.AddressControl;
-import org.apache.activemq.api.core.management.RoleInfo;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.security.CheckType;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.AddressControl;
+import org.apache.activemq.artemis.api.core.management.RoleInfo;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.security.CheckType;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.apache.activemq.tests.util.RandomUtil.randomString;
+import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString;
 
 public class AddressControlTest extends ManagementTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlUsingCoreTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
index 4c693b0212..f1853f8c98 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
@@ -14,32 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 import org.junit.Before;
 import org.junit.After;
 
 import org.junit.Test;
 
-import static org.apache.activemq.tests.util.RandomUtil.randomString;
+import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.AddressControl;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.security.CheckType;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.AddressControl;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.security.CheckType;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class AddressControlUsingCoreTest extends ManagementTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlTest.java
index 523390878d..f1394c26e8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlTest.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
+import org.apache.activemq.artemis.tests.integration.SimpleNotificationService;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -27,22 +28,21 @@ import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
 
 import org.junit.Assert;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.BridgeControl;
-import org.apache.activemq.api.core.management.CoreNotificationType;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.core.config.BridgeConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.management.Notification;
-import org.apache.activemq.tests.integration.SimpleNotificationService;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.BridgeControl;
+import org.apache.activemq.artemis.api.core.management.CoreNotificationType;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.core.config.BridgeConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.management.Notification;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class BridgeControlTest extends ManagementTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlUsingCoreTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
index 5dccb2ffb5..f8f5bb06b5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -28,22 +28,22 @@ import javax.management.MBeanServerFactory;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.core.config.BridgeConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.core.config.BridgeConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class BridgeControlUsingCoreTest extends ManagementTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java
index f88bfdad8c..bd0c0cb067 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -23,16 +24,16 @@ import java.util.List;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.BroadcastGroupConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.core.management.BroadcastGroupControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.api.core.Pair;
-import org.apache.activemq.utils.json.JSONArray;
+import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.management.BroadcastGroupControl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.Pair;
+import org.apache.activemq.artemis.utils.json.JSONArray;
 
 public class BroadcastGroupControlTest extends ManagementTestBase
 {
@@ -65,7 +66,7 @@ public class BroadcastGroupControlTest extends ManagementTestBase
    @Test
    public void testAttributes() throws Exception
    {
-      TransportConfiguration connectorConfiguration = new TransportConfiguration(NETTY_CONNECTOR_FACTORY);
+      TransportConfiguration connectorConfiguration = new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY);
       List connectorInfos = new ArrayList();
       connectorInfos.add(connectorConfiguration.getName());
       BroadcastGroupConfiguration broadcastGroupConfig = BroadcastGroupControlTest.randomBroadcastGroupConfiguration(connectorInfos);
@@ -73,7 +74,7 @@ public class BroadcastGroupControlTest extends ManagementTestBase
       Configuration conf = createBasicConfig()
          .addConnectorConfiguration(connectorConfiguration.getName(), connectorConfiguration)
          .addBroadcastGroupConfiguration(broadcastGroupConfig)
-         .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY));
+         .addAcceptorConfiguration(new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY));
       service = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, false));
       service.start();
 
@@ -103,7 +104,7 @@ public class BroadcastGroupControlTest extends ManagementTestBase
    @Test
    public void testStartStop() throws Exception
    {
-      TransportConfiguration connectorConfiguration = new TransportConfiguration(NETTY_CONNECTOR_FACTORY);
+      TransportConfiguration connectorConfiguration = new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY);
       List connectorInfos = new ArrayList();
       connectorInfos.add(connectorConfiguration.getName());
       BroadcastGroupConfiguration broadcastGroupConfig = BroadcastGroupControlTest.randomBroadcastGroupConfiguration(connectorInfos);
@@ -111,7 +112,7 @@ public class BroadcastGroupControlTest extends ManagementTestBase
       Configuration conf = createBasicConfig()
          .addConnectorConfiguration(connectorConfiguration.getName(), connectorConfiguration)
          .addBroadcastGroupConfiguration(broadcastGroupConfig)
-         .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY));
+         .addAcceptorConfiguration(new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY));
       service = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, false));
       service.start();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlUsingCoreTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlUsingCoreTest.java
index ce38fe2508..acfb92e32e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlUsingCoreTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.BroadcastGroupControl;
-import org.apache.activemq.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.BroadcastGroupControl;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
 
 public class BroadcastGroupControlUsingCoreTest extends BroadcastGroupControlTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControl2Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
index 0809afa75e..03cd26a82d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControl2Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -30,18 +31,18 @@ import javax.management.MBeanServerFactory;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.BroadcastGroupConfiguration;
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.core.management.ClusterConnectionControl;
-import org.apache.activemq.core.config.ClusterConnectionConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.management.ClusterConnectionControl;
+import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class ClusterConnectionControl2Test extends ManagementTestBase
 {
@@ -107,12 +108,12 @@ public class ClusterConnectionControl2Test extends ManagementTestBase
 
       Map acceptorParams_1 = new HashMap();
       acceptorParams_1.put(TransportConstants.PORT_PROP_NAME, port_1);
-      TransportConfiguration acceptorConfig_0 = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY);
+      TransportConfiguration acceptorConfig_0 = new TransportConfiguration(UnitTestCase.NETTY_ACCEPTOR_FACTORY);
 
-      TransportConfiguration acceptorConfig_1 = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, acceptorParams_1);
+      TransportConfiguration acceptorConfig_1 = new TransportConfiguration(UnitTestCase.NETTY_ACCEPTOR_FACTORY, acceptorParams_1);
 
-      TransportConfiguration connectorConfig_1 = new TransportConfiguration(NETTY_CONNECTOR_FACTORY, acceptorParams_1);
-      TransportConfiguration connectorConfig_0 = new TransportConfiguration(NETTY_CONNECTOR_FACTORY);
+      TransportConfiguration connectorConfig_1 = new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY, acceptorParams_1);
+      TransportConfiguration connectorConfig_0 = new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY);
 
       CoreQueueConfiguration queueConfig = new CoreQueueConfiguration()
          .setAddress(RandomUtil.randomString())
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
index a0aef9d953..f496bd7a81 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 import org.junit.Before;
 import org.junit.After;
 import org.junit.Test;
@@ -28,25 +28,25 @@ import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
 
 import org.junit.Assert;
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.core.management.ClusterConnectionControl;
-import org.apache.activemq.api.core.management.CoreNotificationType;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.core.config.ClusterConnectionConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.management.Notification;
-import org.apache.activemq.tests.integration.SimpleNotificationService;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.utils.json.JSONArray;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.management.ClusterConnectionControl;
+import org.apache.activemq.artemis.api.core.management.CoreNotificationType;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.management.Notification;
+import org.apache.activemq.artemis.tests.integration.SimpleNotificationService;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.json.JSONArray;
 
 public class ClusterConnectionControlTest extends ManagementTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
index 4941ba1b3d..45a17937d4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.ClusterConnectionControl;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.ClusterConnectionControl;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
index cf0117e9cc..cf2a38730c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientRequestor;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.management.ManagementHelper;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientRequestor;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.management.ManagementHelper;
 
 public class CoreMessagingProxy
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java
index c7848a4ba6..83e14cbb2b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 import org.junit.Before;
 import org.junit.After;
 
@@ -22,17 +22,17 @@ import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.DivertControl;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.config.DivertConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.DivertControl;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.config.DivertConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class DivertControlTest extends ManagementTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlUsingCoreTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java
index f651cf567e..98b77e52b0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.DivertControl;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.DivertControl;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java
index dc065a75af..a3da04c0ae 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementActivationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementActivationTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementActivationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementActivationTest.java
index 11c61958a8..4c2b972c3d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementActivationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementActivationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Queue;
@@ -23,14 +23,14 @@ import javax.naming.NameNotFoundException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.integration.cluster.failover.FailoverTestBase;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.integration.cluster.failover.FailoverTestBase;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementControlHelper.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementControlHelper.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementControlHelper.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementControlHelper.java
index 413c92141b..2b538a880a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementControlHelper.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementControlHelper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
 import javax.jms.Queue;
 import javax.jms.Topic;
@@ -22,20 +22,20 @@ import javax.management.MBeanServer;
 import javax.management.MBeanServerInvocationHandler;
 import javax.management.ObjectName;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.management.AcceptorControl;
-import org.apache.activemq.api.core.management.AddressControl;
-import org.apache.activemq.api.core.management.BridgeControl;
-import org.apache.activemq.api.core.management.BroadcastGroupControl;
-import org.apache.activemq.api.core.management.ClusterConnectionControl;
-import org.apache.activemq.api.core.management.DivertControl;
-import org.apache.activemq.api.core.management.ActiveMQServerControl;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.core.management.QueueControl;
-import org.apache.activemq.api.jms.management.ConnectionFactoryControl;
-import org.apache.activemq.api.jms.management.JMSQueueControl;
-import org.apache.activemq.api.jms.management.JMSServerControl;
-import org.apache.activemq.api.jms.management.TopicControl;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.management.AcceptorControl;
+import org.apache.activemq.artemis.api.core.management.AddressControl;
+import org.apache.activemq.artemis.api.core.management.BridgeControl;
+import org.apache.activemq.artemis.api.core.management.BroadcastGroupControl;
+import org.apache.activemq.artemis.api.core.management.ClusterConnectionControl;
+import org.apache.activemq.artemis.api.core.management.DivertControl;
+import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.api.jms.management.ConnectionFactoryControl;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
+import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
+import org.apache.activemq.artemis.api.jms.management.TopicControl;
 
 public class ManagementControlHelper
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementHelperTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementHelperTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
index 461a9d15d3..dbf526608d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementHelperTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.management.ManagementHelper;
-import org.apache.activemq.core.client.impl.ClientMessageImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.management.ManagementHelper;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementServiceImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementServiceImplTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java
index 4c160064c8..9db746fa0a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementServiceImplTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java
@@ -14,29 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
+import org.apache.activemq.artemis.tests.unit.core.postoffice.impl.FakeQueue;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.management.AddressControl;
-import org.apache.activemq.api.core.management.ManagementHelper;
-import org.apache.activemq.api.core.management.QueueControl;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.persistence.impl.nullpm.NullStorageManager;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.core.server.management.impl.ManagementServiceImpl;
-import org.apache.activemq.tests.integration.server.FakeStorageManager;
-import org.apache.activemq.tests.unit.core.postoffice.impl.FakeQueue;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.management.AddressControl;
+import org.apache.activemq.artemis.api.core.management.ManagementHelper;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.artemis.core.server.management.impl.ManagementServiceImpl;
+import org.apache.activemq.artemis.tests.integration.server.FakeStorageManager;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class ManagementServiceImplTest extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java
index 228705a932..8472eb9b9c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
-import org.apache.activemq.api.core.management.QueueControl;
-import org.apache.activemq.api.jms.management.JMSQueueControl;
+package org.apache.activemq.artemis.tests.integration.management;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
 import org.junit.Before;
 import org.junit.After;
 
@@ -26,11 +26,11 @@ import javax.management.ObjectName;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public abstract class ManagementTestBase extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithPagingServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithPagingServerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java
index 8de472a385..b838155013 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithPagingServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
 import java.nio.ByteBuffer;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.QueueControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.utils.json.JSONArray;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.json.JSONArray;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java
index 68d33fb025..065d7eb4ad 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory;
+package org.apache.activemq.artemis.tests.integration.management;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory;
 import org.junit.Before;
 import org.junit.After;
 
@@ -33,20 +33,20 @@ import java.util.Map;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.protocol.stomp.Stomp;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class ManagementWithStompTest extends ManagementTestBase
 {
@@ -97,7 +97,7 @@ public class ManagementWithStompTest extends ManagementTestBase
 
       frame = receiveFrame(10000);
       System.out.println(frame);
-      assertTrue(frame.contains("_AMQ_OperationSucceeded:true"));
+      Assert.assertTrue(frame.contains("_AMQ_OperationSucceeded:true"));
       // the address will be returned in the message body in a JSON array
       Assert.assertTrue(frame.contains("[\"" + address + "\"]"));
 
@@ -141,9 +141,9 @@ public class ManagementWithStompTest extends ManagementTestBase
 
       frame = receiveFrame(10000);
       System.out.println(frame);
-      assertTrue(frame.contains("_AMQ_OperationSucceeded:true"));
+      Assert.assertTrue(frame.contains("_AMQ_OperationSucceeded:true"));
       // there is no such messages => 0 returned in a JSON array
-      assertTrue(frame.contains("[0]"));
+      Assert.assertTrue(frame.contains("[0]"));
 
       frame = "UNSUBSCRIBE\n" + "destination:" + queue + "\n" +
          "receipt: 123\n\n" +
@@ -258,8 +258,8 @@ public class ManagementWithStompTest extends ManagementTestBase
    protected void waitForReceipt() throws Exception
    {
       String frame = receiveFrame(50000);
-      assertNotNull(frame);
-      assertTrue(frame.indexOf("RECEIPT") > -1);
+      Assert.assertNotNull(frame);
+      Assert.assertTrue(frame.indexOf("RECEIPT") > -1);
    }
 
    // Inner classes -------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java
index 106a43d3e3..aec091c1a5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java
@@ -14,36 +14,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.ManagementHelper;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.ManagementHelper;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.apache.activemq.api.core.management.CoreNotificationType.BINDING_ADDED;
-import static org.apache.activemq.api.core.management.CoreNotificationType.BINDING_REMOVED;
-import static org.apache.activemq.api.core.management.CoreNotificationType.CONSUMER_CLOSED;
-import static org.apache.activemq.api.core.management.CoreNotificationType.CONSUMER_CREATED;
+import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.BINDING_ADDED;
+import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.BINDING_REMOVED;
+import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.CONSUMER_CLOSED;
+import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.CONSUMER_CREATED;
 
 public class NotificationTest extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index fa142ee914..ac8012b5f8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
 import java.util.LinkedList;
 import java.util.Map;
@@ -23,34 +23,34 @@ import java.util.concurrent.TimeUnit;
 
 import javax.management.Notification;
 
-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.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.CoreNotificationType;
-import org.apache.activemq.api.core.management.DayCounterInfo;
-import org.apache.activemq.api.core.management.ActiveMQServerControl;
-import org.apache.activemq.api.core.management.MessageCounterInfo;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.core.management.QueueControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.message.impl.MessageImpl;
-import org.apache.activemq.core.messagecounter.impl.MessageCounterManagerImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.jms.server.management.JMSUtil;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.utils.json.JSONArray;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.CoreNotificationType;
+import org.apache.activemq.artemis.api.core.management.DayCounterInfo;
+import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
+import org.apache.activemq.artemis.api.core.management.MessageCounterInfo;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.message.impl.MessageImpl;
+import org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterManagerImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.integration.jms.server.management.JMSUtil;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.json.JSONArray;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -264,7 +264,7 @@ public class QueueControlTest extends ManagementTestBase
       producer.send(session.createMessage(false));
       Assert.assertEquals(1, getMessageCount(queueControl));
 
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
 
       Assert.assertEquals(0, getMessageCount(queueControl));
 
@@ -320,7 +320,7 @@ public class QueueControlTest extends ManagementTestBase
       producer.send(session.createMessage(false));
       Assert.assertEquals(2, getMessagesAdded(queueControl));
 
-      ManagementTestBase.consumeMessages(2, session, queue);
+      consumeMessages(2, session, queue);
 
       Assert.assertEquals(2, getMessagesAdded(queueControl));
 
@@ -340,10 +340,10 @@ public class QueueControlTest extends ManagementTestBase
 
       ClientProducer producer = session.createProducer(address);
       producer.send(session.createMessage(false));
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
       Assert.assertEquals(1, queueControl.getMessagesAcknowledged());
       producer.send(session.createMessage(false));
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
       Assert.assertEquals(2, queueControl.getMessagesAcknowledged());
 
 //      ManagementTestBase.consumeMessages(2, session, queue);
@@ -377,12 +377,12 @@ public class QueueControlTest extends ManagementTestBase
       }
 
       Assert.assertEquals(1, queueControl.getScheduledCount());
-      ManagementTestBase.consumeMessages(0, session, queue);
+      consumeMessages(0, session, queue);
 
       Thread.sleep(delay * 2);
 
       Assert.assertEquals(0, queueControl.getScheduledCount());
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
 
       session.deleteQueue(queue);
    }
@@ -570,7 +570,7 @@ public class QueueControlTest extends ManagementTestBase
       messages = queueControl.listScheduledMessages();
       Assert.assertEquals(0, messages.length);
 
-      ManagementTestBase.consumeMessages(2, session, queue);
+      consumeMessages(2, session, queue);
 
       session.deleteQueue(queue);
    }
@@ -607,7 +607,7 @@ public class QueueControlTest extends ManagementTestBase
       array = new JSONArray(jsonString);
       Assert.assertEquals(0, array.length());
 
-      ManagementTestBase.consumeMessages(2, session, queue);
+      consumeMessages(2, session, queue);
 
       session.deleteQueue(queue);
    }
@@ -660,7 +660,7 @@ public class QueueControlTest extends ManagementTestBase
       Assert.assertEquals(1, array.length());
       Assert.assertEquals(intValue, array.getJSONObject(0).get("key"));
 
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
 
       jsonString = queueControl.listMessagesAsJSON(null);
       Assert.assertNotNull(jsonString);
@@ -696,7 +696,7 @@ public class QueueControlTest extends ManagementTestBase
       Assert.assertEquals(1, messages.length);
       Assert.assertEquals(matchingValue, messages[0].get("key"));
 
-      ManagementTestBase.consumeMessages(2, session, queue);
+      consumeMessages(2, session, queue);
 
       messages = queueControl.listMessages(filter);
       Assert.assertEquals(0, messages.length);
@@ -720,7 +720,7 @@ public class QueueControlTest extends ManagementTestBase
       Map[] messages = queueControl.listMessages(null);
       Assert.assertEquals(2, messages.length);
 
-      ManagementTestBase.consumeMessages(2, session, queue);
+      consumeMessages(2, session, queue);
 
       messages = queueControl.listMessages(null);
       Assert.assertEquals(0, messages.length);
@@ -744,7 +744,7 @@ public class QueueControlTest extends ManagementTestBase
       Map[] messages = queueControl.listMessages("");
       Assert.assertEquals(2, messages.length);
 
-      ManagementTestBase.consumeMessages(2, session, queue);
+      consumeMessages(2, session, queue);
 
       messages = queueControl.listMessages("");
       Assert.assertEquals(0, messages.length);
@@ -780,7 +780,7 @@ public class QueueControlTest extends ManagementTestBase
       Assert.assertEquals(1, array.length());
       Assert.assertEquals(matchingValue, array.getJSONObject(0).get("key"));
 
-      ManagementTestBase.consumeMessages(2, session, queue);
+      consumeMessages(2, session, queue);
 
       jsonString = queueControl.listMessagesAsJSON(filter);
       Assert.assertNotNull(jsonString);
@@ -826,7 +826,7 @@ public class QueueControlTest extends ManagementTestBase
       Assert.assertEquals(0, getMessageCount(queueControl));
 
       // check there is no message to consume from queue
-      ManagementTestBase.consumeMessages(0, session, queue);
+      consumeMessages(0, session, queue);
 
       // consume the message from otherQueue
       ClientConsumer otherConsumer = session.createConsumer(otherQueue);
@@ -871,7 +871,7 @@ public class QueueControlTest extends ManagementTestBase
       }
       Assert.assertEquals(1, getMessageCount(queueControl));
 
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
 
       session.deleteQueue(queue);
    }
@@ -968,8 +968,8 @@ public class QueueControlTest extends ManagementTestBase
       Assert.assertEquals(1, getMessageCount(queueControl));
       Assert.assertEquals(1, getMessageCount(otherQueueControl));
 
-      ManagementTestBase.consumeMessages(1, session, queue);
-      ManagementTestBase.consumeMessages(1, session, otherQueue);
+      consumeMessages(1, session, queue);
+      consumeMessages(1, session, otherQueue);
 
       session.deleteQueue(queue);
       session.deleteQueue(otherQueue);
@@ -1007,7 +1007,7 @@ public class QueueControlTest extends ManagementTestBase
       }
       Assert.assertEquals(1, getMessageCount(queueControl));
 
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
 
       session.deleteQueue(queue);
    }
@@ -1185,7 +1185,7 @@ public class QueueControlTest extends ManagementTestBase
       Assert.assertEquals(1, getMessageCount(queueControl));
 
       // check there is a single message to consume from queue
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
 
       session.deleteQueue(queue);
    }
@@ -1227,7 +1227,7 @@ public class QueueControlTest extends ManagementTestBase
          Thread.sleep(100);
       }
 
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
 
       session.deleteQueue(queue);
    }
@@ -1277,7 +1277,7 @@ public class QueueControlTest extends ManagementTestBase
       cons.close();
 
       // check there is a single message to consume from queue
-      ManagementTestBase.consumeMessages(99, session, queue);
+      consumeMessages(99, session, queue);
 
       session.deleteQueue(queue);
    }
@@ -1445,8 +1445,8 @@ public class QueueControlTest extends ManagementTestBase
       Assert.assertEquals(0, getMessageCount(queueControl));
       Assert.assertEquals(1, getMessageCount(expiryQueueControl));
 
-      ManagementTestBase.consumeMessages(0, session, queue);
-      ManagementTestBase.consumeMessages(1, session, expiryQueue);
+      consumeMessages(0, session, queue);
+      consumeMessages(1, session, expiryQueue);
 
       session.deleteQueue(queue);
       session.deleteQueue(expiryQueue);
@@ -1489,10 +1489,10 @@ public class QueueControlTest extends ManagementTestBase
       Assert.assertEquals(1, getMessageCount(deadLetterQueueControl));
 
       // check there is a single message to consume from queue
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
 
       // check there is a single message to consume from deadletter queue
-      ManagementTestBase.consumeMessages(1, session, deadLetterQueue);
+      consumeMessages(1, session, deadLetterQueue);
 
       session.deleteQueue(queue);
       session.deleteQueue(deadLetterQueue);
@@ -1614,7 +1614,7 @@ public class QueueControlTest extends ManagementTestBase
       Assert.assertEquals(2, info.getCount());
       Assert.assertEquals(1, info.getCountDelta());
 
-      ManagementTestBase.consumeMessages(2, session, queue);
+      consumeMessages(2, session, queue);
 
       Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
       jsonString = queueControl.listMessageCounter();
@@ -1657,7 +1657,7 @@ public class QueueControlTest extends ManagementTestBase
       Assert.assertEquals(1, info.getCount());
       Assert.assertEquals(1, info.getCountDelta());
 
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
 
       Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
       jsonString = queueControl.listMessageCounter();
@@ -1755,7 +1755,7 @@ public class QueueControlTest extends ManagementTestBase
       {
          ClientMessage msg = session.createMessage(true);
 
-         msg.putStringProperty(org.apache.activemq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i));
+         msg.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i));
 
          prod1.send(msg);
       }
@@ -1828,7 +1828,7 @@ public class QueueControlTest extends ManagementTestBase
       {
          ClientMessage msg = session.createMessage(true);
 
-         msg.putStringProperty(org.apache.activemq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i));
+         msg.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i));
 
          prod1.send(msg);
       }
@@ -1936,7 +1936,7 @@ public class QueueControlTest extends ManagementTestBase
       producer.send(session.createMessage(false));
       Assert.assertEquals(2, getMessagesAdded(queueControl));
 
-      ManagementTestBase.consumeMessages(2, session, queue);
+      consumeMessages(2, session, queue);
 
       Assert.assertEquals(2, getMessagesAdded(queueControl));
 
@@ -1960,10 +1960,10 @@ public class QueueControlTest extends ManagementTestBase
 
       ClientProducer producer = session.createProducer(address);
       producer.send(session.createMessage(false));
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
       Assert.assertEquals(1, queueControl.getMessagesAcknowledged());
       producer.send(session.createMessage(false));
-      ManagementTestBase.consumeMessages(1, session, queue);
+      consumeMessages(1, session, queue);
       Assert.assertEquals(2, queueControl.getMessagesAcknowledged());
 
       queueControl.resetMessagesAcknowledged();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlUsingCoreTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java
index 5632d471b5..1a016683a2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.QueueControl;
-import org.apache.activemq.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
 import org.junit.Before;
 
 public class QueueControlUsingCoreTest extends QueueControlTest
@@ -195,7 +195,14 @@ public class QueueControlUsingCoreTest extends QueueControlTest
           */
          public Long getFirstMessageAge() throws Exception
          {
-            return (Long) proxy.invokeOperation("getFirstMessageAge");
+            Object value = proxy.invokeOperation("getFirstMessageAge");
+
+            if (value instanceof Integer)
+            {
+               return ((Integer) value).longValue();
+            }
+
+            return (Long) value;
          }
 
          public String listMessageCounterHistoryAsHTML() throws Exception
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java
similarity index 80%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java
index 3550f463e8..c3770c103a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
+package org.apache.activemq.artemis.tests.integration.management;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientRequestor;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.ManagementHelper;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientRequestor;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.ManagementHelper;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 
 public abstract class SecurityManagementTestBase extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
index b77579de06..5220bf06b7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.junit.Test;
 
 import java.util.Set;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.HierarchicalRepository;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
 
 public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManagementTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
index a3d87e2806..14947d80ab 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.junit.Test;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
 
 public class SecurityManagementWithDefaultConfigurationTest extends SecurityManagementTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
index 67dc37f393..d7291c64c6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
+package org.apache.activemq.artemis.tests.integration.management;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.junit.Test;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
 
 public class SecurityManagementWithModifiedConfigurationTest extends SecurityManagementTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
index 92735ae1d4..90ac2bbb30 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
@@ -14,40 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.management;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
+package org.apache.activemq.artemis.tests.integration.management;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
 import org.junit.Test;
 
-import static org.apache.activemq.api.core.management.CoreNotificationType.SECURITY_AUTHENTICATION_VIOLATION;
-import static org.apache.activemq.api.core.management.CoreNotificationType.SECURITY_PERMISSION_VIOLATION;
+import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.SECURITY_AUTHENTICATION_VIOLATION;
+import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.SECURITY_PERMISSION_VIOLATION;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.ManagementHelper;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.security.CheckType;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.ManagementHelper;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.security.CheckType;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class SecurityNotificationTest extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/BasicOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/BasicOpenWireTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
index 887b23c24e..6ca20fe489 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/BasicOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire;
+package org.apache.activemq.artemis.tests.integration.openwire;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -31,7 +31,7 @@ import javax.jms.TextMessage;
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.SimpleString;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/BasicSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicSecurityTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/BasicSecurityTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicSecurityTest.java
index 40f8ef2012..144da2936d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/BasicSecurityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicSecurityTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire;
+package org.apache.activemq.artemis.tests.integration.openwire;
 
 import javax.jms.Connection;
 import javax.jms.Destination;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
index 172958f4f7..193b0ccbcf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire;
+package org.apache.activemq.artemis.tests.integration.openwire;
 
 import javax.jms.ConnectionFactory;
 import javax.management.MBeanServer;
@@ -26,21 +26,21 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.management.JMSServerControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireUtilTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireUtilTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireUtilTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireUtilTest.java
index e29324711b..38af8e80d5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireUtilTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireUtilTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire;
+package org.apache.activemq.artemis.tests.integration.openwire;
 
 import static org.junit.Assert.assertEquals;
 
-import org.apache.activemq.core.protocol.openwire.OpenWireUtil;
+import org.apache.activemq.artemis.core.protocol.openwire.OpenWireUtil;
 import org.junit.Test;
 
 public class OpenWireUtilTest
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
index 588291ed8f..442e9c7548 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire;
+package org.apache.activemq.artemis.tests.integration.openwire;
 
 import javax.jms.Connection;
 import javax.jms.Destination;
@@ -31,8 +31,7 @@ import javax.jms.TextMessage;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.junit.Assert;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -312,7 +311,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest
       try
       {
          MessageConsumer consumer = session.createConsumer(queue);
-         Assert.fail("supposed to throw an exception here");
+         fail("supposed to throw an exception here");
       }
       catch (JMSException e)
       {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer10Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer10Test.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer10Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer10Test.java
index d78bc250cb..7c40d0d445 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer10Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer10Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer11Test.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer11Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer11Test.java
index f596835f3d..4bb2f369e3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer11Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer11Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer12Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer12Test.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer12Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer12Test.java
index 3b431dfe43..a5573519c9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer12Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer12Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -24,7 +24,7 @@ import javax.jms.MessageConsumer;
 import javax.jms.Session;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer13Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer13Test.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer13Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer13Test.java
index 72de9ca142..b47ecb2ad3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer13Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer13Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer1Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer1Test.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer1Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer1Test.java
index 7927d9c0c6..2c572c51bf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer1Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer1Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -29,7 +29,7 @@ import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQMessageConsumer;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer2Test.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer2Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer2Test.java
index 0fce8cf7a9..ca47b7f4fa 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer2Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer2Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.Collections;
@@ -33,7 +33,7 @@ import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQMessageConsumer;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer3Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer3Test.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer3Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer3Test.java
index ed68dce06b..988413adde 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer3Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer3Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer4Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer4Test.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer4Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer4Test.java
index 6938cd74ee..768425787a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer4Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer4Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -28,7 +28,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer5Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer5Test.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer5Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer5Test.java
index a1c90b335f..eecb927c9e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer5Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer5Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -31,7 +31,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer6Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer6Test.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer6Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer6Test.java
index a08aa9080a..0bbf5ec553 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer6Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer6Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -32,7 +32,7 @@ import javax.jms.TextMessage;
 import org.apache.activemq.ActiveMQMessageConsumer;
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer7Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer7Test.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer7Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer7Test.java
index fcee2a279d..cc2ff1712d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer7Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer7Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -31,7 +31,7 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer8Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer8Test.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer8Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer8Test.java
index 8dfd991d42..601e1199d3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer8Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer8Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -31,7 +31,7 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer9Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer9Test.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer9Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer9Test.java
index f831c2a1ea..7ae6e2e1a7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSConsumer9Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer9Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -29,7 +29,7 @@ import javax.jms.MessageListener;
 import javax.jms.Session;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java
index 12f2a1d903..85b36708ad 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.Message;
 import javax.jms.Session;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSIndividualAckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSIndividualAckTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSIndividualAckTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSIndividualAckTest.java
index c2b50b1277..fc0624f1d4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSIndividualAckTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSIndividualAckTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -26,7 +26,7 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSMessageTest.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSMessageTest.java
index e8bf400131..204846961c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -36,7 +36,7 @@ import javax.jms.StreamMessage;
 import javax.jms.TextMessage;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSQueueRedeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSQueueRedeliverTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSQueueRedeliverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSQueueRedeliverTest.java
index 8a47681ee5..468b0d35bb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSQueueRedeliverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSQueueRedeliverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSUsecase1Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSUsecase1Test.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSUsecase1Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSUsecase1Test.java
index 240ca8aa0e..fb565e196e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSUsecase1Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSUsecase1Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -27,7 +27,7 @@ import javax.jms.Session;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSUsecaseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSUsecaseTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSUsecaseTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSUsecaseTest.java
index 1c5b246863..28be3360e6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JMSUsecaseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSUsecaseTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -29,7 +29,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsAutoAckListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsAutoAckListenerTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsAutoAckListenerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsAutoAckListenerTest.java
index dab6ce99e7..e95ead67e6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsAutoAckListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsAutoAckListenerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -26,7 +26,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsAutoAckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsAutoAckTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsAutoAckTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsAutoAckTest.java
index 293cdae87b..2f64f13b69 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsAutoAckTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsAutoAckTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -23,7 +23,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsClientAckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsClientAckTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsClientAckTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsClientAckTest.java
index c1780a77f0..4b018850a4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsClientAckTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsClientAckTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -23,7 +23,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsConnectionStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConnectionStartStopTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsConnectionStartStopTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConnectionStartStopTest.java
index ce263ba731..e64b816013 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsConnectionStartStopTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConnectionStartStopTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Random;
 import java.util.Vector;
@@ -32,7 +32,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java
index e8b1e26928..7d6a5c4a22 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Vector;
 import java.util.concurrent.CountDownLatch;
@@ -31,7 +31,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java
index 171d263816..dce7bbc806 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
@@ -24,7 +24,7 @@ import javax.jms.Session;
 import javax.jms.Topic;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java
index 53f09ef3c6..0de84bb770 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.DeliveryMode;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java
index 35b1232639..a55d50b794 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java
index ba99f389e7..d2deb99fcf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.Connection;
 import javax.jms.Destination;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java
index 3ad4c89432..c89477b284 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.DeliveryMode;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java
index dfc35bb43e..a2ced8e900 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.DeliveryMode;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsQueueBrowserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsQueueBrowserTest.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsQueueBrowserTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsQueueBrowserTest.java
index 7e310cb503..47d3692919 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsQueueBrowserTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsQueueBrowserTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Enumeration;
 
@@ -27,7 +27,7 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java
index 4e17be0b9f..238a0d8e70 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsResourceProvider.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsResourceProvider.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsResourceProvider.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsResourceProvider.java
index 67126f16ce..d949af2bba 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsResourceProvider.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsResourceProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionConsumer;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java
index 394f71122b..61fc9381b3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,7 +33,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicRedeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRedeliverTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicRedeliverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRedeliverTest.java
index 5aa04b7842..45e945ec0d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicRedeliverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRedeliverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -27,7 +27,7 @@ import javax.jms.Topic;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java
index 49afbcb74f..4f8fbf06d2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.List;
 import java.util.Vector;
@@ -32,7 +32,7 @@ import javax.jms.TemporaryTopic;
 import javax.jms.TextMessage;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSelectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicSelectorTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSelectorTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicSelectorTest.java
index c899610240..a14522809f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSelectorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicSelectorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;
@@ -27,7 +27,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java
index 143cfb2b2e..1797b99bc1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.DeliveryMode;
 import javax.jms.JMSException;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java
index 630e89eeea..af34b93c25 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.Connection;
 import javax.jms.Destination;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicTransactionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicTransactionTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicTransactionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicTransactionTest.java
index 1a02cf4f33..648130f79f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicTransactionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicTransactionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 /**
  * adapted from: org.apache.activemq.JmsTopicTransactionTest
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java
index 93c513158f..22e5588203 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTransactionTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTransactionTestSupport.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTransactionTestSupport.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTransactionTestSupport.java
index 9d3f1ed20f..b53cc23ea8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/JmsTransactionTestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTransactionTestSupport.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +31,7 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQPrefetchPolicy;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java
index a8e5400fac..e8f9811b7e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
@@ -39,7 +39,7 @@ import org.apache.activemq.RedeliveryPolicy;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java
index b021a57421..5e3f79834f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -31,9 +31,9 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ProducerFlowControlTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java
index b47e20d423..661dfb1ad5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ProducerFlowControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.DeliveryMode;
 import javax.jms.JMSException;
@@ -30,10 +30,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.apache.activemq.transport.tcp.TcpTransport;
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java
index c937ec01a3..4ebdd367d5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.Connection;
 import javax.jms.InvalidClientIDException;
@@ -22,7 +22,7 @@ import javax.jms.JMSException;
 import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/RedeliveryPolicyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/RedeliveryPolicyTest.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/RedeliveryPolicyTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/RedeliveryPolicyTest.java
index 68c7224b3d..6c0334756f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/RedeliveryPolicyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/RedeliveryPolicyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
@@ -26,7 +26,7 @@ import org.apache.activemq.broker.region.policy.RedeliveryPolicyMap;
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/TimeStampTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/TimeStampTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/TimeStampTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/TimeStampTest.java
index e3f8a38da1..5ddcbf9eed 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/TimeStampTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/TimeStampTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;
@@ -23,7 +23,7 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Test;
 
 /**
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/TransactionContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/TransactionContextTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/TransactionContextTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/TransactionContextTest.java
index 749f305083..8fae040e62 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/amq/TransactionContextTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/TransactionContextTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.amq;
+package org.apache.activemq.artemis.tests.integration.openwire.amq;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -22,7 +22,7 @@ import javax.jms.TransactionRolledBackException;
 
 import org.apache.activemq.TransactionContext;
 import org.apache.activemq.transaction.Synchronization;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/interop/GeneralInteropTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/GeneralInteropTest.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/interop/GeneralInteropTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/GeneralInteropTest.java
index f0c20ceb7f..c7df7119ae 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/interop/GeneralInteropTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/GeneralInteropTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.interop;
+package org.apache.activemq.artemis.tests.integration.openwire.interop;
 
 import java.io.Serializable;
 
@@ -32,8 +32,8 @@ import javax.jms.TextMessage;
 import org.apache.activemq.ActiveMQMessageConsumer;
 import org.apache.activemq.ActiveMQMessageProducer;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.tests.integration.openwire.BasicOpenWireTest;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/util/Wait.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/util/Wait.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/util/Wait.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/util/Wait.java
index 9b1beb9ede..365ee2d46d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/util/Wait.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/util/Wait.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.openwire.util;
+package org.apache.activemq.artemis.tests.integration.openwire.util;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/MultipleProducersPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/MultipleProducersPagingTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java
index a321e4a93b..878f551851 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/MultipleProducersPagingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.paging;
+package org.apache.activemq.artemis.tests.integration.paging;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -35,18 +35,18 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl;
-import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/NettyPagingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/NettyPagingSendTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/NettyPagingSendTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/NettyPagingSendTest.java
index 223b721b1d..2f38d5b0e9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/NettyPagingSendTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/NettyPagingSendTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.paging;
+package org.apache.activemq.artemis.tests.integration.paging;
 
 public class NettyPagingSendTest extends PagingSendTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PageCountSyncOnNonTXTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PageCountSyncOnNonTXTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PageCountSyncOnNonTXTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PageCountSyncOnNonTXTest.java
index b07dc99cc6..8c1020bcf6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PageCountSyncOnNonTXTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PageCountSyncOnNonTXTest.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.paging;
+package org.apache.activemq.artemis.tests.integration.paging;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PageCountSyncServer.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PageCountSyncServer.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PageCountSyncServer.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PageCountSyncServer.java
index 14e6fac18b..b5d0ab8846 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PageCountSyncServer.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PageCountSyncServer.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.paging;
+package org.apache.activemq.artemis.tests.integration.paging;
 
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 
 /**
- * This is a sub process of the test {@link org.apache.activemq.tests.integration.paging.PageCountSyncOnNonTXTest}
+ * This is a sub process of the test {@link PageCountSyncOnNonTXTest}
  *  The System.out calls here are meant to be here as they will appear on the process output and test output.
  *  It helps to identify what happened on the test in case of failures.
  */
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingCounterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java
index ae695c1700..720f8f5f3b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingCounterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.paging;
+package org.apache.activemq.artemis.tests.integration.paging;
 
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.paging.cursor.PageSubscription;
-import org.apache.activemq.core.paging.cursor.PageSubscriptionCounter;
-import org.apache.activemq.core.paging.cursor.impl.PageSubscriptionCounterImpl;
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.core.transaction.Transaction;
-import org.apache.activemq.core.transaction.impl.TransactionImpl;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
+import org.apache.activemq.artemis.core.paging.cursor.PageSubscriptionCounter;
+import org.apache.activemq.artemis.core.paging.cursor.impl.PageSubscriptionCounterImpl;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.transaction.Transaction;
+import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingReceiveTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java
index aa03d893b9..56014b8bdc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingReceiveTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.paging;
+package org.apache.activemq.artemis.tests.integration.paging;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingSendTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java
index cc94a9dbf7..840f0ae92a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingSendTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.paging;
+package org.apache.activemq.artemis.tests.integration.paging;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -25,23 +25,23 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-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.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.MessageReference;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.LinkedListIterator;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.utils.LinkedListIterator;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverAndCountersTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverAndCountersTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverAndCountersTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverAndCountersTest.java
index 596f7f95e7..2b8487b594 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverAndCountersTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverAndCountersTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.paging;
+package org.apache.activemq.artemis.tests.integration.paging;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverBackup.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverBackup.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverBackup.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverBackup.java
index 7620ff723f..6c23a0c088 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverBackup.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverBackup.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.paging;
+package org.apache.activemq.artemis.tests.integration.paging;
 
-import org.apache.activemq.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
 
 /**
- * There is no difference between this class and {@link org.apache.activemq.tests.integration.paging.PagingWithFailoverServer}
+ * There is no difference between this class and {@link PagingWithFailoverServer}
  * other than helping us identify it on the logs, as it will show with a different name through spawned logs
  */
 public class PagingWithFailoverBackup extends PagingWithFailoverServer
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverServer.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverServer.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverServer.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverServer.java
index 5bd5ce2dbd..287f1c3c6a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/PagingWithFailoverServer.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverServer.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.paging;
+package org.apache.activemq.artemis.tests.integration.paging;
 
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 
 public class PagingWithFailoverServer extends SpawnedServerSupport
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/SpawnedServerSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java
similarity index 77%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/SpawnedServerSupport.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java
index f91291b56d..eb9b6cabe4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/paging/SpawnedServerSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java
@@ -14,28 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.paging;
+package org.apache.activemq.artemis.tests.integration.paging;
 
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.ClusterConnectionConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.HAPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 /**
  * Support class for server that are using an external process on the testsuite
@@ -60,7 +60,7 @@ public class SpawnedServerSupport
       Configuration conf = ServiceTestBase.createBasicConfig(folder, 0)
          .setPersistenceEnabled(true)
          .addAddressesSetting("#", settings)
-         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory"));
+         .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory"));
 
       return conf;
    }
@@ -134,7 +134,7 @@ public class SpawnedServerSupport
          className = NettyConnectorFactory.class.getName();
       }
       Map serverParams = new HashMap();
-      serverParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port);
+      serverParams.put(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port);
       return new TransportConfiguration(className, serverParams);
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java
similarity index 87%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java
index de6e3aaca1..d5d3d74775 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 import org.junit.Before;
 import org.junit.After;
 
@@ -24,11 +24,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.persistence.config.PersistedAddressSetting;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.persistence.config.PersistedAddressSetting;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 
 public class AddressSettingsConfigurationStorageTest extends StorageManagerTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteMessagesOnStartupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
similarity index 70%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteMessagesOnStartupTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
index 7614590b11..c271ecf9e9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteMessagesOnStartupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
@@ -14,22 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.persistence.GroupingInfo;
-import org.apache.activemq.core.persistence.QueueBindingInfo;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.PostOfficeJournalLoader;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.tests.unit.core.postoffice.impl.FakeQueue;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakePostOffice;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.tests.unit.core.postoffice.impl.FakeQueue;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.persistence.GroupingInfo;
+import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.PostOfficeJournalLoader;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class DeleteMessagesOnStartupTest extends StorageManagerTestBase
@@ -69,11 +70,11 @@ public class DeleteMessagesOnStartupTest extends StorageManagerTestBase
 
       journal.loadMessageJournal(postOffice, null, null, null, null, null, null, new PostOfficeJournalLoader(postOffice, null, journal, null, null, null, null, null, queues));
 
-      assertEquals(98, deletedMessage.size());
+      Assert.assertEquals(98, deletedMessage.size());
 
       for (Long messageID : deletedMessage)
       {
-         assertTrue("messageID = " + messageID, messageID.longValue() >= 2 && messageID <= 99);
+         Assert.assertTrue("messageID = " + messageID, messageID.longValue() >= 2 && messageID <= 99);
       }
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteQueueRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java
similarity index 84%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteQueueRestartTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java
index fe49af34a7..c7ae62283e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteQueueRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.client.ActiveMQBytesMessage;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.client.ActiveMQBytesMessage;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DuplicateCacheTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DuplicateCacheTest.java
similarity index 79%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DuplicateCacheTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DuplicateCacheTest.java
index e9fb75df50..8c64df4349 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DuplicateCacheTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DuplicateCacheTest.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.postoffice.DuplicateIDCache;
-import org.apache.activemq.core.postoffice.impl.DuplicateIDCacheImpl;
-import org.apache.activemq.core.transaction.impl.TransactionImpl;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache;
+import org.apache.activemq.artemis.core.postoffice.impl.DuplicateIDCacheImpl;
+import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class DuplicateCacheTest extends StorageManagerTestBase
@@ -57,15 +58,15 @@ public class DuplicateCacheTest extends StorageManagerTestBase
 
       byte[] id = RandomUtil.randomBytes();
 
-      assertFalse(cache.contains(id));
+      Assert.assertFalse(cache.contains(id));
 
       cache.addToCache(id, null);
 
-      assertTrue(cache.contains(id));
+      Assert.assertTrue(cache.contains(id));
 
       cache.deleteFromCache(id);
 
-      assertFalse(cache.contains(id));
+      Assert.assertFalse(cache.contains(id));
    }
 
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/ExportFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/ExportFormatTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
index 317be686b1..e37f659c29 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/ExportFormatTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 
-import org.apache.activemq.tools.ExportJournal;
-import org.apache.activemq.tools.ImportJournal;
+import org.apache.activemq.artemis.tools.ExportJournal;
+import org.apache.activemq.artemis.tools.ImportJournal;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.StringReader;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class ExportFormatTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
index 20e045c2c7..31e4a475b1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
-import org.apache.activemq.api.core.Pair;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory;
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.Pair;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSDynamicConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSDynamicConfigTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
index 0cba1e90eb..6eea0ac888 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSDynamicConfigTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Test;
 
 import java.util.ArrayList;
 
 import javax.naming.NamingException;
 
-import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl;
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
 
 public class JMSDynamicConfigTest extends JMSTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSStorageManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSStorageManagerTest.java
similarity index 73%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSStorageManagerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSStorageManagerTest.java
index a6ef85f168..f2d7efe8e1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSStorageManagerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSStorageManagerTest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.List;
 
-import org.apache.activemq.jms.persistence.config.PersistedDestination;
-import org.apache.activemq.jms.persistence.config.PersistedBindings;
-import org.apache.activemq.jms.persistence.config.PersistedType;
+import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination;
+import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings;
+import org.apache.activemq.artemis.jms.persistence.config.PersistedType;
 
 public class JMSStorageManagerTest extends StorageManagerTestBase
 {
@@ -41,15 +42,15 @@ public class JMSStorageManagerTest extends StorageManagerTestBase
 
       List jndiList = jmsJournal.recoverPersistedBindings();
 
-      assertEquals(1, destinations.size());
+      Assert.assertEquals(1, destinations.size());
 
-      assertEquals(1, jndiList.size());
+      Assert.assertEquals(1, jndiList.size());
 
       jmsJournal.deleteDestination(PersistedType.Queue, "jndiPersistQueue");
 
       destinations = jmsJournal.recoverDestinations();
 
-      assertEquals(0, destinations.size());
+      Assert.assertEquals(0, destinations.size());
 
       jmsJournal.stop();
 
@@ -57,19 +58,19 @@ public class JMSStorageManagerTest extends StorageManagerTestBase
 
       destinations = jmsJournal.recoverDestinations();
 
-      assertEquals(0, destinations.size());
+      Assert.assertEquals(0, destinations.size());
 
       jndiList = jmsJournal.recoverPersistedBindings();
 
-      assertEquals(1, jndiList.size());
+      Assert.assertEquals(1, jndiList.size());
 
       PersistedBindings jndi = jndiList.get(0);
 
       List jndis = jndi.getBindings();
 
-      assertEquals(1, jndis.size());
+      Assert.assertEquals(1, jndis.size());
 
-      assertEquals("jndi-1", jndis.get(0));
+      Assert.assertEquals("jndi-1", jndis.get(0));
 
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/RestartSMTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
similarity index 80%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/RestartSMTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
index 7110dee33c..96e6bdc4f9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/RestartSMTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,17 +22,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.persistence.GroupingInfo;
-import org.apache.activemq.core.persistence.QueueBindingInfo;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakeJournalLoader;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakePostOffice;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.ExecutorFactory;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.persistence.GroupingInfo;
+import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeJournalLoader;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.utils.ExecutorFactory;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/RolesConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/RolesConfigurationStorageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
index 649d54d0f6..e3a3618a10 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/RolesConfigurationStorageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.persistence.config.PersistedRoles;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.persistence.config.PersistedRoles;
 
 public class RolesConfigurationStorageTest extends StorageManagerTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/StorageManagerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
similarity index 77%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/StorageManagerTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
index cc4b93be07..9fcf90da42 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/StorageManagerTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.persistence.GroupingInfo;
-import org.apache.activemq.core.persistence.QueueBindingInfo;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.jms.persistence.JMSStorageManager;
-import org.apache.activemq.jms.persistence.impl.journal.JMSJournalStorageManagerImpl;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakeJournalLoader;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakePostOffice;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.ExecutorFactory;
-import org.apache.activemq.utils.TimeAndCounterIDGenerator;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.persistence.GroupingInfo;
+import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.jms.persistence.JMSStorageManager;
+import org.apache.activemq.artemis.jms.persistence.impl.journal.JMSJournalStorageManagerImpl;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeJournalLoader;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.utils.ExecutorFactory;
+import org.apache.activemq.artemis.utils.TimeAndCounterIDGenerator;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
index 3511cc322c..b1cc0375ba 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -25,12 +25,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.jms.server.config.impl.TransportConfigurationEncodingSupport;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.jms.server.config.impl.TransportConfigurationEncodingSupport;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.Pair;
 
 import org.junit.Assert;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/XmlImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/XmlImportExportTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
index d5a93848a5..c45f8e2608 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/XmlImportExportTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.persistence;
+package org.apache.activemq.artemis.tests.integration.persistence;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.unit.util.InVMContext;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.unit.util.InVMContext;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
@@ -30,24 +30,24 @@ import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.persistence.impl.journal.LargeServerMessageImpl;
-import org.apache.activemq.tools.XmlDataConstants;
-import org.apache.activemq.tools.XmlDataExporter;
-import org.apache.activemq.tools.XmlDataImporter;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageImpl;
+import org.apache.activemq.artemis.tools.XmlDataConstants;
+import org.apache.activemq.artemis.tools.XmlDataExporter;
+import org.apache.activemq.artemis.tools.XmlDataImporter;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -434,10 +434,10 @@ public class XmlImportExportTest extends ServiceTestBase
       assertEquals(clientFailureCheckPeriod, hcf1.getClientFailureCheckPeriod());
       assertEquals(connectionTTl, hcf1.getConnectionTTL());
       assertEquals(callTimeout, hcf1.getCallTimeout());
-//      Assert.assertEquals(callFailoverTimeout, hcf1.getCallFailoverTimeout());  // this value isn't currently persisted by org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl.encode()
-//      Assert.assertEquals(cacheLargeMessagesClient, hcf1.isCacheLargeMessagesClient()); // this value isn't currently supported by org.apache.activemq.api.jms.management.JMSServerControl.createConnectionFactory(java.lang.String, boolean, boolean, int, java.lang.String, java.lang.String, java.lang.String, long, long, long, long, int, boolean, int, int, int, int, int, boolean, boolean, boolean, boolean, boolean, java.lang.String, int, int, boolean, int, int, long, double, long, int, boolean, java.lang.String)
+//      Assert.assertEquals(callFailoverTimeout, hcf1.getCallFailoverTimeout());  // this value isn't currently persisted by org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl.encode()
+//      Assert.assertEquals(cacheLargeMessagesClient, hcf1.isCacheLargeMessagesClient()); // this value isn't currently supported by org.apache.activemq.artemis.api.jms.management.JMSServerControl.createConnectionFactory(java.lang.String, boolean, boolean, int, java.lang.String, java.lang.String, java.lang.String, long, long, long, long, int, boolean, int, int, int, int, int, boolean, boolean, boolean, boolean, boolean, java.lang.String, int, int, boolean, int, int, long, double, long, int, boolean, java.lang.String)
       assertEquals(minLargeMessageSize, hcf1.getMinLargeMessageSize());
-//      Assert.assertEquals(compressLargeMessages, hcf1.isCompressLargeMessage());  // this value isn't currently handled properly by org.apache.activemq.jms.server.impl.JMSServerManagerImpl.createConnectionFactory(java.lang.String, boolean, org.apache.activemq.api.jms.JMSFactoryType, java.util.List, java.lang.String, long, long, long, long, boolean, int, boolean, int, int, int, int, int, boolean, boolean, boolean, boolean, boolean, java.lang.String, int, int, boolean, int, int, long, double, long, int, boolean, java.lang.String, java.lang.String...)()
+//      Assert.assertEquals(compressLargeMessages, hcf1.isCompressLargeMessage());  // this value isn't currently handled properly by org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl.createConnectionFactory(java.lang.String, boolean, org.apache.activemq.artemis.api.jms.JMSFactoryType, java.util.List, java.lang.String, long, long, long, long, boolean, int, boolean, int, int, int, int, int, boolean, boolean, boolean, boolean, boolean, java.lang.String, int, int, boolean, int, int, long, double, long, int, boolean, java.lang.String, java.lang.String...)()
       assertEquals(consumerWindowSize, hcf1.getConsumerWindowSize());
       assertEquals(consumerMaxRate, hcf1.getConsumerMaxRate());
       assertEquals(confirmationWindowSize, hcf1.getConfirmationWindowSize());
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/proton/ProtonTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/proton/ProtonTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
index 366e3c5787..61871e3f79 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/proton/ProtonTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.proton;
+package org.apache.activemq.artemis.tests.integration.proton;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -40,22 +40,22 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Random;
 
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.apache.qpid.amqp_1_0.client.Receiver;
 import org.apache.qpid.amqp_1_0.client.Sender;
 import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
 import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
 import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.ByteUtil;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.utils.ByteUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -161,7 +161,7 @@ public class ProtonTest extends ServiceTestBase
             Thread.sleep(1);
          }
 
-         assertEquals("The remoting connection wasn't removed after connection.close()", 0, server.getRemotingService().getConnections().size());
+         Assert.assertEquals("The remoting connection wasn't removed after connection.close()", 0, server.getRemotingService().getConnections().size());
          server.stop();
       }
       finally
@@ -188,7 +188,7 @@ public class ProtonTest extends ServiceTestBase
       connection.start();
 
       message = (TextMessage)cons.receive(5000);
-      assertNotNull(message);
+      Assert.assertNotNull(message);
 
    }
 
@@ -252,14 +252,14 @@ public class ProtonTest extends ServiceTestBase
                while (enumeration.hasMoreElements())
                {
                   Message msg = (Message) enumeration.nextElement();
-                  assertNotNull("" + count, msg);
-                  assertTrue("" + msg, msg instanceof TextMessage);
+                  Assert.assertNotNull("" + count, msg);
+                  Assert.assertTrue("" + msg, msg instanceof TextMessage);
                   String text = ((TextMessage) msg).getText();
-                  assertEquals(text, "msg:" + count++);
+                  Assert.assertEquals(text, "msg:" + count++);
                }
-               assertEquals(count, numMessages);
+               Assert.assertEquals(count, numMessages);
                connection.close();
-               assertEquals(getMessageCount(q), numMessages);
+               Assert.assertEquals(getMessageCount(q), numMessages);
             }
          }, 1000);
 
@@ -278,7 +278,7 @@ public class ProtonTest extends ServiceTestBase
 
       // There is a bug on the qpid client library currently, we can expect having to interrupt the thread on browsers.
       // but we can't have it on 10 iterations... something must be broken if that's the case
-      assertTrue("Test had to interrupt on all ocasions.. this is beyond the expected for the test", success);
+      Assert.assertTrue("Test had to interrupt on all ocasions.. this is beyond the expected for the test", success);
    }
 
    @Test
@@ -288,7 +288,7 @@ public class ProtonTest extends ServiceTestBase
 
       MessageConsumer cons = session.createConsumer(createQueue(address));
 
-      org.apache.activemq.core.server.Queue serverQueue = server.locateQueue(SimpleString.toSimpleString(coreAddress));
+      org.apache.activemq.artemis.core.server.Queue serverQueue = server.locateQueue(SimpleString.toSimpleString(coreAddress));
 
       assertEquals(1, serverQueue.getConsumerCount());
 
@@ -322,7 +322,7 @@ public class ProtonTest extends ServiceTestBase
       {
          Thread.sleep(1);
       }
-      assertEquals(numMessages, getMessageCount(q));
+      Assert.assertEquals(numMessages, getMessageCount(q));
    }
 
    @Test
@@ -343,7 +343,7 @@ public class ProtonTest extends ServiceTestBase
       session.close();
       connection.close();
       Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString(coreAddress)).getBindable();
-      assertEquals(getMessageCount(q), 0);
+      Assert.assertEquals(getMessageCount(q), 0);
    }
 
    @Test
@@ -371,7 +371,7 @@ public class ProtonTest extends ServiceTestBase
          Thread.sleep(1);
       }
 
-      assertEquals(numMessages, getMessageCount(q));
+      Assert.assertEquals(numMessages, getMessageCount(q));
       //now create a new connection and receive
       connection = createConnection();
       session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -379,7 +379,7 @@ public class ProtonTest extends ServiceTestBase
       Thread.sleep(1000);
       consumer.close();
       connection.close();
-      assertEquals(numMessages, getMessageCount(q));
+      Assert.assertEquals(numMessages, getMessageCount(q));
       long taken = (System.currentTimeMillis() - time) / 1000;
       System.out.println("taken = " + taken);
    }
@@ -407,7 +407,7 @@ public class ProtonTest extends ServiceTestBase
       {
          Thread.sleep(1);
       }
-      assertEquals(numMessages, getMessageCount(q));
+      Assert.assertEquals(numMessages, getMessageCount(q));
       //now create a new connection and receive
       connection = createConnection();
       session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
@@ -419,17 +419,17 @@ public class ProtonTest extends ServiceTestBase
          {
             System.out.println("ProtonTest.testManyMessages");
          }
-         assertNotNull("" + i, msg);
-         assertTrue("" + msg, msg instanceof TextMessage);
+         Assert.assertNotNull("" + i, msg);
+         Assert.assertTrue("" + msg, msg instanceof TextMessage);
          String text = ((TextMessage) msg).getText();
          //System.out.println("text = " + text);
-         assertEquals(text, "msg:" + i);
+         Assert.assertEquals(text, "msg:" + i);
          msg.acknowledge();
       }
 
       consumer.close();
       connection.close();
-      assertEquals(0, getMessageCount(q));
+      Assert.assertEquals(0, getMessageCount(q));
       long taken = (System.currentTimeMillis() - time) / 1000;
       System.out.println("taken = " + taken);
 
@@ -471,7 +471,7 @@ public class ProtonTest extends ServiceTestBase
                      }
 
                      Message m = consumer.receive(5000);
-                     assertNotNull("Could not receive message count=" + count + " on consumer", m);
+                     Assert.assertNotNull("Could not receive message count=" + count + " on consumer", m);
                      count--;
                   }
                   catch (JMSException e)
@@ -526,7 +526,7 @@ public class ProtonTest extends ServiceTestBase
       Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString(coreAddress)).getBindable();
 
       connection.close();
-      assertEquals(0, getMessageCount(q));
+      Assert.assertEquals(0, getMessageCount(q));
 
 
       long taken = (System.currentTimeMillis() - time);
@@ -572,7 +572,7 @@ public class ProtonTest extends ServiceTestBase
       for (int i = 0; i < numMessages; i++)
       {
          BytesMessage m = (BytesMessage) consumer.receive(5000);
-         assertNotNull("Could not receive message count=" + i + " on consumer", m);
+         Assert.assertNotNull("Could not receive message count=" + i + " on consumer", m);
 
          m.reset();
 
@@ -624,7 +624,7 @@ public class ProtonTest extends ServiceTestBase
       for (int i = 0; i < numMessages; i++)
       {
          Message m = consumer.receive(5000);
-         assertNotNull("Could not receive message count=" + i + " on consumer", m);
+         Assert.assertNotNull("Could not receive message count=" + i + " on consumer", m);
       }
 
 //      assertEquals(0, q.getMessageCount());
@@ -661,7 +661,7 @@ public class ProtonTest extends ServiceTestBase
       for (int i = 0; i < numMessages; i++)
       {
          MapMessage m = (MapMessage) consumer.receive(5000);
-         assertNotNull("Could not receive message count=" + i + " on consumer", m);
+         Assert.assertNotNull("Could not receive message count=" + i + " on consumer", m);
 
          Assert.assertEquals(i, m.getInt("i"));
          Assert.assertEquals(i, m.getIntProperty("count"));
@@ -699,11 +699,11 @@ public class ProtonTest extends ServiceTestBase
       for (int i = 0; i < numMessages; i++)
       {
          StreamMessage m = (StreamMessage) consumer.receive(5000);
-         assertNotNull("Could not receive message count=" + i + " on consumer", m);
+         Assert.assertNotNull("Could not receive message count=" + i + " on consumer", m);
 
-         assertEquals(i, m.readInt());
-         assertEquals(true, m.readBoolean());
-         assertEquals("test", m.readString());
+         Assert.assertEquals(i, m.readInt());
+         Assert.assertEquals(true, m.readBoolean());
+         Assert.assertEquals("test", m.readString());
       }
 
    }
@@ -733,7 +733,7 @@ public class ProtonTest extends ServiceTestBase
       for (int i = 0; i < numMessages; i++)
       {
          TextMessage m = (TextMessage) consumer.receive(5000);
-         assertNotNull("Could not receive message count=" + i + " on consumer", m);
+         Assert.assertNotNull("Could not receive message count=" + i + " on consumer", m);
          Assert.assertEquals("text" + i, m.getText());
       }
 
@@ -768,10 +768,10 @@ public class ProtonTest extends ServiceTestBase
       for (int i = 0; i < numMessages; i++)
       {
          ObjectMessage msg = (ObjectMessage) consumer.receive(5000);
-         assertNotNull("Could not receive message count=" + i + " on consumer", msg);
+         Assert.assertNotNull("Could not receive message count=" + i + " on consumer", msg);
 
          AnythingSerializable someSerialThing = (AnythingSerializable) msg.getObject();
-         assertEquals(i, someSerialThing.getCount());
+         Assert.assertEquals(i, someSerialThing.getCount());
       }
 
 //      assertEquals(0, q.getMessageCount());
@@ -796,9 +796,9 @@ public class ProtonTest extends ServiceTestBase
       connection.start();
       MessageConsumer messageConsumer = session.createConsumer(queue, "color = 'RED'");
       TextMessage m = (TextMessage) messageConsumer.receive(5000);
-      assertNotNull(m);
-      assertEquals("msg:1", m.getText());
-      assertEquals(m.getStringProperty("color"), "RED");
+      Assert.assertNotNull(m);
+      Assert.assertEquals("msg:1", m.getText());
+      Assert.assertEquals(m.getStringProperty("color"), "RED");
       connection.close();
    }
 
@@ -822,17 +822,17 @@ public class ProtonTest extends ServiceTestBase
       connection.start();
       MessageConsumer messageConsumer = session.createConsumer(queue);
       TextMessage m = (TextMessage) messageConsumer.receive(5000);
-      assertNotNull(m);
-      assertEquals("msg:0", m.getText());
-      assertEquals(m.getBooleanProperty("true"), true);
-      assertEquals(m.getBooleanProperty("false"), false);
-      assertEquals(m.getStringProperty("foo"), "bar");
-      assertEquals(m.getDoubleProperty("double"), 66.6, 0.0001);
-      assertEquals(m.getFloatProperty("float"), 56.789f, 0.0001);
-      assertEquals(m.getIntProperty("int"), 8);
-      assertEquals(m.getByteProperty("byte"), (byte) 10);
+      Assert.assertNotNull(m);
+      Assert.assertEquals("msg:0", m.getText());
+      Assert.assertEquals(m.getBooleanProperty("true"), true);
+      Assert.assertEquals(m.getBooleanProperty("false"), false);
+      Assert.assertEquals(m.getStringProperty("foo"), "bar");
+      Assert.assertEquals(m.getDoubleProperty("double"), 66.6, 0.0001);
+      Assert.assertEquals(m.getFloatProperty("float"), 56.789f, 0.0001);
+      Assert.assertEquals(m.getIntProperty("int"), 8);
+      Assert.assertEquals(m.getByteProperty("byte"), (byte) 10);
       m = (TextMessage) messageConsumer.receive(5000);
-      assertNotNull(m);
+      Assert.assertNotNull(m);
       connection.close();
    }
 
@@ -908,7 +908,7 @@ public class ProtonTest extends ServiceTestBase
          // Step 3. Create a sender
          Sender sender = session.createSender(queue);
 
-         assertNotNull(server.locateQueue(new SimpleString(queue)));
+         Assert.assertNotNull(server.locateQueue(new SimpleString(queue)));
 
          // Step 4. send a simple message
          sender.send(new org.apache.qpid.amqp_1_0.client.Message("I am an amqp message"));
@@ -960,7 +960,7 @@ public class ProtonTest extends ServiceTestBase
          // Step 3. create a moving receiver, this means the message will be removed from the queue
          Receiver rec = session.createMovingReceiver(queue);
 
-         assertNotNull(server.locateQueue(new SimpleString(queue)));
+         Assert.assertNotNull(server.locateQueue(new SimpleString(queue)));
 
          // Step 4. Create a sender
          Sender sender = session.createSender(queue);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQActivationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQActivationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java
index 47822a8899..397bf520c8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQActivationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
-import org.apache.activemq.ra.inflow.ActiveMQActivationSpec;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec;
 import org.junit.Test;
 
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class ActiveMQActivationTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQClusteredTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQClusteredTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
index a332eb733e..c91ebb354d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQClusteredTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.ra.inflow.ActiveMQActivation;
-import org.apache.activemq.ra.inflow.ActiveMQActivationSpec;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivation;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec;
 import org.junit.Test;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java
index 622b1eadfa..3d41c7e490 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.ra.inflow.ActiveMQActivationSpec;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
 import org.junit.Test;
 
 public class ActiveMQMessageHandlerSecurityTest extends ActiveMQRATestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java
index 34ff74afaa..0c0a7a7b2b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
 import javax.jms.Message;
 import javax.resource.ResourceException;
@@ -24,21 +24,21 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSession.QueueQuery;
-import org.apache.activemq.api.core.client.SessionFailureListener;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.ra.inflow.ActiveMQActivation;
-import org.apache.activemq.ra.inflow.ActiveMQActivationSpec;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSession.QueueQuery;
+import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivation;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerXATest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerXATest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java
index 81681c6704..03231e73c4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerXATest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.ra.inflow.ActiveMQActivationSpec;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec;
 import org.junit.Test;
 
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 import javax.jms.Message;
 import javax.resource.ResourceException;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQRAClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRAClusteredTestBase.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQRAClusteredTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRAClusteredTestBase.java
index aeccc02073..55fadcfcbd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQRAClusteredTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRAClusteredTestBase.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
 import java.util.HashMap;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 
 public class ActiveMQRAClusteredTestBase extends ActiveMQRATestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQRATestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQRATestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java
index 6b4a9123fa..eccdb96549 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQRATestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
 import javax.jms.Message;
 import javax.jms.MessageListener;
@@ -36,14 +36,14 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.client.ActiveMQMessage;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.ra.inflow.ActiveMQActivation;
-import org.apache.activemq.tests.util.JMSTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivation;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/DummyTransaction.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/DummyTransaction.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/DummyTransaction.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/DummyTransaction.java
index 4bd9d7397a..42d20bb2de 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/DummyTransaction.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/DummyTransaction.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
 import javax.transaction.HeuristicMixedException;
 import javax.transaction.HeuristicRollbackException;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/DummyTransactionManager.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/DummyTransactionManager.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/DummyTransactionManager.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/DummyTransactionManager.java
index 2602eef6bc..45453c88b9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/DummyTransactionManager.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/DummyTransactionManager.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
 import javax.transaction.HeuristicMixedException;
 import javax.transaction.HeuristicRollbackException;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java
index 3210655627..2a397ddc5d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
 import javax.jms.JMSContext;
 import javax.jms.JMSRuntimeException;
@@ -22,15 +22,15 @@ import javax.transaction.TransactionManager;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.ra.ActiveMQRAConnectionFactory;
-import org.apache.activemq.ra.ActiveMQRAConnectionFactoryImpl;
-import org.apache.activemq.ra.ActiveMQRAConnectionManager;
-import org.apache.activemq.ra.ActiveMQRAManagedConnectionFactory;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.service.extensions.ServiceUtils;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactory;
+import org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactoryImpl;
+import org.apache.activemq.artemis.ra.ActiveMQRAConnectionManager;
+import org.apache.activemq.artemis.ra.ActiveMQRAManagedConnectionFactory;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.service.extensions.ServiceUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java
index f4df15792f..82c45d05dc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
 import javax.jms.Connection;
 import javax.jms.JMSContext;
@@ -38,21 +38,21 @@ import javax.transaction.xa.Xid;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.ra.ActiveMQRAConnectionFactory;
-import org.apache.activemq.ra.ActiveMQRAConnectionFactoryImpl;
-import org.apache.activemq.ra.ActiveMQRAConnectionManager;
-import org.apache.activemq.ra.ActiveMQRAManagedConnectionFactory;
-import org.apache.activemq.ra.ActiveMQRASession;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapper;
-import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapperImpl;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.utils.UUIDGenerator;
-import org.apache.activemq.utils.VersionLoader;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactory;
+import org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactoryImpl;
+import org.apache.activemq.artemis.ra.ActiveMQRAConnectionManager;
+import org.apache.activemq.artemis.ra.ActiveMQRAManagedConnectionFactory;
+import org.apache.activemq.artemis.ra.ActiveMQRASession;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapper;
+import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapperImpl;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
+import org.apache.activemq.artemis.utils.VersionLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTestJTA.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTestJTA.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java
index 65002d60e9..e515645326 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTestJTA.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
 import javax.jms.Connection;
 import javax.jms.JMSContext;
@@ -32,20 +32,20 @@ import javax.jms.TextMessage;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.ra.ActiveMQRAConnectionFactory;
-import org.apache.activemq.ra.ActiveMQRAConnectionFactoryImpl;
-import org.apache.activemq.ra.ActiveMQRAConnectionManager;
-import org.apache.activemq.ra.ActiveMQRAManagedConnectionFactory;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.service.extensions.ServiceUtils;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactory;
+import org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactoryImpl;
+import org.apache.activemq.artemis.ra.ActiveMQRAConnectionManager;
+import org.apache.activemq.artemis.ra.ActiveMQRAManagedConnectionFactory;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.service.extensions.ServiceUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
index cbb98e44d9..4ea46c8a55 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ra;
+package org.apache.activemq.artemis.tests.integration.ra;
 
 import javax.jms.Connection;
 import javax.resource.ResourceException;
@@ -26,23 +26,24 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ServerLocatorImpl;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.ra.inflow.ActiveMQActivation;
-import org.apache.activemq.ra.inflow.ActiveMQActivationSpec;
-import org.apache.activemq.service.extensions.xa.recovery.XARecoveryConfig;
-import org.apache.activemq.tests.unit.ra.MessageEndpointFactory;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.DefaultSensitiveStringCodec;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.tests.unit.ra.BootstrapContext;
+import org.apache.activemq.artemis.tests.unit.ra.MessageEndpointFactory;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivation;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec;
+import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConfig;
+import org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec;
 import org.junit.Test;
 
 public class ResourceAdapterTest extends ActiveMQRATestBase
@@ -59,10 +60,10 @@ public class ResourceAdapterTest extends ActiveMQRATestBase
 
       ActiveMQResourceAdapter ra = new ActiveMQResourceAdapter();
 
-      ra.setConnectorClassName("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory");
+      ra.setConnectorClassName("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory");
       ra.setUserName("userGlobal");
       ra.setPassword("passwordGlobal");
-      ra.start(new org.apache.activemq.tests.unit.ra.BootstrapContext());
+      ra.start(new BootstrapContext());
 
       Connection conn = ra.getDefaultActiveMQConnectionFactory().createConnection();
 
@@ -623,7 +624,7 @@ public class ResourceAdapterTest extends ActiveMQRATestBase
    public void testMaskPassword() throws Exception
    {
       ActiveMQResourceAdapter qResourceAdapter = new ActiveMQResourceAdapter();
-      qResourceAdapter.setConnectorClassName(UnitTestCase.INVM_CONNECTOR_FACTORY);
+      qResourceAdapter.setConnectorClassName(INVM_CONNECTOR_FACTORY);
       ActiveMQRATestBase.MyBootstrapContext ctx = new ActiveMQRATestBase.MyBootstrapContext();
 
       DefaultSensitiveStringCodec codec = new DefaultSensitiveStringCodec();
@@ -660,7 +661,7 @@ public class ResourceAdapterTest extends ActiveMQRATestBase
    public void testMaskPassword2() throws Exception
    {
       ActiveMQResourceAdapter qResourceAdapter = new ActiveMQResourceAdapter();
-      qResourceAdapter.setConnectorClassName(UnitTestCase.INVM_CONNECTOR_FACTORY);
+      qResourceAdapter.setConnectorClassName(INVM_CONNECTOR_FACTORY);
       ActiveMQRATestBase.MyBootstrapContext ctx = new ActiveMQRATestBase.MyBootstrapContext();
 
       qResourceAdapter.setUseMaskedPassword(true);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/BatchDelayTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java
similarity index 76%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/BatchDelayTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java
index f6f770e15a..52b078c437 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/BatchDelayTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java
@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.remoting;
+package org.apache.activemq.artemis.tests.integration.remoting;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.junit.Assert;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -22,18 +24,17 @@ import org.junit.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 
 public class BatchDelayTest extends ServiceTestBase
 {
@@ -114,7 +115,7 @@ public class BatchDelayTest extends ServiceTestBase
 
       msg = cons.receive(10000);
 
-      assertNotNull(msg);
+      Assert.assertNotNull(msg);
 
       msg.acknowledge();
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/DestroyConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/DestroyConsumerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java
index cbd31044ca..25b1613f3e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/DestroyConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.remoting;
+package org.apache.activemq.artemis.tests.integration.remoting;
 
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Test;
 
-import org.apache.activemq.tests.util.ServiceTestBase;
-
 public class DestroyConsumerTest extends ServiceTestBase
 {
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/DirectDeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java
similarity index 73%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/DirectDeliverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java
index 523c0b8048..84ba78e61c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/DirectDeliverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.remoting;
+package org.apache.activemq.artemis.tests.integration.remoting;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -22,24 +23,23 @@ import org.junit.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
 
 public class DirectDeliverTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NettyNetworkAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettyNetworkAddressTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NettyNetworkAddressTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettyNetworkAddressTest.java
index 33d53e0758..537b858efd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NettyNetworkAddressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettyNetworkAddressTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.remoting;
+package org.apache.activemq.artemis.tests.integration.remoting;
 
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
 
 public class NettyNetworkAddressTest extends NetworkAddressTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NettySynchronousCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettySynchronousCloseTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NettySynchronousCloseTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettySynchronousCloseTest.java
index c61f887edb..df38bbb211 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NettySynchronousCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettySynchronousCloseTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.remoting;
+package org.apache.activemq.artemis.tests.integration.remoting;
 
 public class NettySynchronousCloseTest extends SynchronousCloseTest
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NetworkAddressTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NetworkAddressTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
index aef830dc49..03712b04fc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/NetworkAddressTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.remoting;
+package org.apache.activemq.artemis.tests.integration.remoting;
 
 import java.net.Inet4Address;
 import java.net.InetAddress;
@@ -27,14 +27,14 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -230,9 +230,9 @@ public abstract class NetworkAddressTestBase extends ServiceTestBase
             if (localPort != 0)
             {
                Iterator iterator = messagingService.getRemotingService().getConnections().iterator();
-               assertTrue("no connection created", iterator.hasNext());
+               Assert.assertTrue("no connection created", iterator.hasNext());
                String address = iterator.next().getTransportConnection().getRemoteAddress();
-               assertTrue(address.endsWith(":" + localPort));
+               Assert.assertTrue(address.endsWith(":" + localPort));
             }
             sf.close();
             System.out.println("connection OK");
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/PingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/PingTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java
index e55b3e0756..ec8db4c411 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/PingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java
@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.remoting;
+package org.apache.activemq.artemis.tests.integration.remoting;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.core.protocol.core.impl.wireformat.Ping;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.Ping;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -28,25 +30,23 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.client.SessionFailureListener;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.remoting.CloseListener;
-import org.apache.activemq.core.remoting.server.impl.RemotingServiceImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.remoting.CloseListener;
+import org.apache.activemq.artemis.core.remoting.server.impl.RemotingServiceImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public class PingTest extends ServiceTestBase
 {
@@ -170,7 +170,7 @@ public class PingTest extends ServiceTestBase
    @Test
    public void testNoFailureNoPinging() throws Exception
    {
-      TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory");
+      TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory");
       ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(transportConfig));
       locator.setClientFailureCheckPeriod(-1);
       locator.setConnectionTTL(-1);
@@ -247,7 +247,7 @@ public class PingTest extends ServiceTestBase
          }
       });
 
-      TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory");
+      TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory");
       ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(transportConfig));
       ClientSessionFactory csf = createSessionFactory(locator);
 
@@ -272,7 +272,7 @@ public class PingTest extends ServiceTestBase
    @Test
    public void testServerFailureNoPing() throws Exception
    {
-      TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory");
+      TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory");
       ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(transportConfig));
       locator.setClientFailureCheckPeriod(PingTest.CLIENT_FAILURE_CHECK_PERIOD);
       locator.setConnectionTTL(PingTest.CLIENT_FAILURE_CHECK_PERIOD * 2);
@@ -368,7 +368,7 @@ public class PingTest extends ServiceTestBase
          }
       });
 
-      TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory");
+      TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory");
       ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(transportConfig));
       locator.setClientFailureCheckPeriod(PingTest.CLIENT_FAILURE_CHECK_PERIOD);
       locator.setConnectionTTL(PingTest.CLIENT_FAILURE_CHECK_PERIOD * 2);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/ReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/ReconnectTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
index dd6e3ece32..defa36a2ec 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/ReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.remoting;
+package org.apache.activemq.artemis.tests.integration.remoting;
 
-import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -26,13 +26,13 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.client.SessionFailureListener;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class ReconnectTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/SynchronousCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/SynchronousCloseTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java
index 4980f157c8..17625f30ca 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/SynchronousCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.remoting;
+package org.apache.activemq.artemis.tests.integration.remoting;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 
 public class SynchronousCloseTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationOrderTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationOrderTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationOrderTest.java
index fe348f2486..b8f303c49d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationOrderTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationOrderTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.replication;
+package org.apache.activemq.artemis.tests.integration.replication;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.tests.integration.cluster.failover.FailoverTestBase;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.cluster.failover.FailoverTestBase;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
 
 public class ReplicationOrderTest extends FailoverTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
similarity index 86%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
index 1586bb816c..68cdc0e389 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.replication;
+package org.apache.activemq.artemis.tests.integration.replication;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,64 +30,64 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.ClusterConnectionConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration;
-import org.apache.activemq.core.journal.EncodingSupport;
-import org.apache.activemq.core.journal.IOAsyncTask;
-import org.apache.activemq.core.journal.IOCompletion;
-import org.apache.activemq.core.journal.Journal;
-import org.apache.activemq.core.journal.JournalLoadInformation;
-import org.apache.activemq.core.journal.LoaderCallback;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.TransactionFailureCallback;
-import org.apache.activemq.core.journal.impl.JournalFile;
-import org.apache.activemq.core.paging.PagedMessage;
-import org.apache.activemq.core.paging.PagingManager;
-import org.apache.activemq.core.paging.PagingStore;
-import org.apache.activemq.core.paging.impl.PagedMessageImpl;
-import org.apache.activemq.core.paging.impl.PagingManagerImpl;
-import org.apache.activemq.core.paging.impl.PagingStoreFactoryNIO;
-import org.apache.activemq.core.persistence.OperationContext;
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl;
-import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.replication.ReplicatedJournal;
-import org.apache.activemq.core.replication.ReplicationManager;
-import org.apache.activemq.core.server.ActiveMQComponent;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.cluster.ClusterController;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.core.settings.HierarchicalRepository;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.ReplicatedBackupUtils;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.TransportConfigurationUtils;
-import org.apache.activemq.utils.ExecutorFactory;
-import org.apache.activemq.utils.ActiveMQThreadFactory;
-import org.apache.activemq.utils.OrderedExecutorFactory;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
+import org.apache.activemq.artemis.core.journal.EncodingSupport;
+import org.apache.activemq.artemis.core.journal.IOAsyncTask;
+import org.apache.activemq.artemis.core.journal.IOCompletion;
+import org.apache.activemq.artemis.core.journal.Journal;
+import org.apache.activemq.artemis.core.journal.JournalLoadInformation;
+import org.apache.activemq.artemis.core.journal.LoaderCallback;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.TransactionFailureCallback;
+import org.apache.activemq.artemis.core.journal.impl.JournalFile;
+import org.apache.activemq.artemis.core.paging.PagedMessage;
+import org.apache.activemq.artemis.core.paging.PagingManager;
+import org.apache.activemq.artemis.core.paging.PagingStore;
+import org.apache.activemq.artemis.core.paging.impl.PagedMessageImpl;
+import org.apache.activemq.artemis.core.paging.impl.PagingManagerImpl;
+import org.apache.activemq.artemis.core.paging.impl.PagingStoreFactoryNIO;
+import org.apache.activemq.artemis.core.persistence.OperationContext;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl;
+import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.replication.ReplicatedJournal;
+import org.apache.activemq.artemis.core.replication.ReplicationManager;
+import org.apache.activemq.artemis.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.cluster.ClusterController;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.util.ReplicatedBackupUtils;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.utils.ExecutorFactory;
+import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
+import org.apache.activemq.artemis.utils.OrderedExecutorFactory;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/DelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/DelayedMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java
index 97fc7f77fc..0e287b6fef 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/DelayedMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java
@@ -14,26 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.scheduling;
+package org.apache.activemq.artemis.tests.integration.scheduling;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 
 public class DelayedMessageTest extends ServiceTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/MultipliedDelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/MultipliedDelayedMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java
index 7403d2b50a..33d32bbb0a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/MultipliedDelayedMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.scheduling;
+package org.apache.activemq.artemis.tests.integration.scheduling;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -136,7 +136,7 @@ public class MultipliedDelayedMessageTest extends ServiceTestBase
       return message;
    }
 
-   // This is based on org.apache.activemq.core.server.impl.QueueImpl.calculateRedeliveryDelay()
+   // This is based on org.apache.activemq.artemis.core.server.impl.QueueImpl.calculateRedeliveryDelay()
    private long calculateExpectedDelay(final long redeliveryDelay, final long maxRedeliveryDelay, final double redeliveryMultiplier, final int deliveryCount)
    {
       int tmpDeliveryCount = deliveryCount > 0 ? deliveryCount - 1 : 0;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/ScheduledMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/ScheduledMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
index a23dc22df5..b9528c4842 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/scheduling/ScheduledMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
@@ -14,30 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.scheduling;
+package org.apache.activemq.artemis.tests.integration.scheduling;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/NettySecurityClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/NettySecurityClientTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/NettySecurityClientTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/NettySecurityClientTest.java
index 873572a4b7..417306b0b1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/NettySecurityClientTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/NettySecurityClientTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.security;
+package org.apache.activemq.artemis.tests.integration.security;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.URL;
 
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
index 7aacd8e197..5f9c50b447 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
@@ -14,30 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.security;
+package org.apache.activemq.artemis.tests.integration.security;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQSecurityException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.HierarchicalRepository;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.tests.util.CreateMessage;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQSecurityException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.CreateMessage;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SimpleClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SimpleClient.java
similarity index 82%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SimpleClient.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SimpleClient.java
index 35362b58c8..b749a2c413 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SimpleClient.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SimpleClient.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.security;
+package org.apache.activemq.artemis.tests.integration.security;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 /**
  * Code to be run in an external VM, via main()
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AIOFileLockTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AIOFileLockTimeoutTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AIOFileLockTimeoutTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AIOFileLockTimeoutTest.java
index 377f55d529..0bb50e5f71 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AIOFileLockTimeoutTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AIOFileLockTimeoutTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AddressFullLoggingTest.java
similarity index 83%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AddressFullLoggingTest.java
index 9bea0fecc3..d948b88889 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AddressFullLoggingTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -23,18 +23,18 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.logs.AssertionLoggerHandler;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ExpiryRunnerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ExpiryRunnerTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java
index f177a5e24e..d4038cc73e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ExpiryRunnerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
-import org.apache.activemq.api.core.ActiveMQException;
+package org.apache.activemq.artemis.tests.integration.server;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -28,21 +29,20 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 
 public class ExpiryRunnerTest extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FakeStorageManager.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FakeStorageManager.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FakeStorageManager.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FakeStorageManager.java
index 503de5cc1d..161c714b0e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FakeStorageManager.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FakeStorageManager.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.core.persistence.impl.nullpm.NullStorageManager;
-import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager;
+import org.apache.activemq.artemis.core.server.ServerMessage;
 
 public class FakeStorageManager extends NullStorageManager
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FileLockTimeoutTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FileLockTimeoutTest.java
index 0e037e69ef..edc9f541cb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FileLockTimeoutTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.JournalType;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.logs.AssertionLoggerHandler;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.JournalType;
+import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/GracefulShutdownTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/GracefulShutdownTest.java
similarity index 85%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/GracefulShutdownTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/GracefulShutdownTest.java
index 77524820f9..ddd2bc0f8c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/GracefulShutdownTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/GracefulShutdownTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQSessionCreationException;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQSessionCreationException;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Test;
 
 public class GracefulShutdownTest extends ServiceTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQRecoveryTest.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQRecoveryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQRecoveryTest.java
index c88acf5c13..2a1236e5bf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQRecoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQRecoveryTest.java
@@ -14,28 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-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.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java
index e734d4c8ca..663e073e14 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.core.server.Queue;
+package org.apache.activemq.artemis.tests.integration.server;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.server.Queue;
 import org.junit.Before;
 import org.junit.After;
 
@@ -24,21 +25,20 @@ import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 
 public class LVQTest extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/NIOFileLockTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/NIOFileLockTimeoutTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/NIOFileLockTimeoutTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/NIOFileLockTimeoutTest.java
index 197b60040f..75b0a6b8ba 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/NIOFileLockTimeoutTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/NIOFileLockTimeoutTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/PredefinedQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/PredefinedQueueTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java
index 024c11bb2d..bf20cc8fca 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/PredefinedQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java
@@ -14,29 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQQueueExistsException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.postoffice.Bindings;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.postoffice.Bindings;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDown3NodeTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDown3NodeTest.java
index 09e3338531..29e6d0e9d5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDown3NodeTest.java
@@ -14,26 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.core.config.ScaleDownConfiguration;
-import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.persistence.impl.journal.LargeServerMessageImpl;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.core.config.ScaleDownConfiguration;
+import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageImpl;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDownDirectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownDirectTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDownDirectTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownDirectTest.java
index 00d8839a99..1e4b9571a9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDownDirectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownDirectTest.java
@@ -15,23 +15,23 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.server.impl.ScaleDownHandler;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.server.impl.ScaleDownHandler;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDownTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDownTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java
index 9119927812..ac77bf9c17 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDownTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.core.config.ScaleDownConfiguration;
-import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.core.config.ScaleDownConfiguration;
+import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java
similarity index 90%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java
index d79f4d1c6a..17fec0ae2f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.logs.AssertionLoggerHandler;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.jboss.logmanager.Level;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SuppliedThreadPoolTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SuppliedThreadPoolTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
index 6711041cd1..ae2d6ebfc8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SuppliedThreadPoolTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.server;
+package org.apache.activemq.artemis.tests.integration.server;
 
 import java.lang.reflect.Field;
 import java.util.concurrent.ExecutorService;
@@ -24,10 +24,10 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.core.server.impl.ServiceRegistry;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.core.server.impl.ServiceRegistry;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/ExampleListener.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/ExampleListener.java
similarity index 92%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/ExampleListener.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/ExampleListener.java
index f3c0c4372d..b14047926c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/ExampleListener.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/ExampleListener.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.spring;
+package org.apache.activemq.artemis.tests.integration.spring;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.utils.ReusableLatch;
+import org.apache.activemq.artemis.utils.ReusableLatch;
 
 public class ExampleListener implements MessageListener
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/MessageSender.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/MessageSender.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/MessageSender.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/MessageSender.java
index 7826aeac40..9a4e2110b5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/MessageSender.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/MessageSender.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.spring;
+package org.apache.activemq.artemis.tests.integration.spring;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/SpringIntegrationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/SpringIntegrationTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/SpringIntegrationTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/SpringIntegrationTest.java
index fe165d2a98..3bac31dc3a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/spring/SpringIntegrationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/SpringIntegrationTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.spring;
+package org.apache.activemq.artemis.tests.integration.spring;
 
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
index df34ea3276..7ecf920d95 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ssl;
+package org.apache.activemq.artemis.tests.integration.ssl;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -23,26 +23,26 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.ActiveMQConnectionTimedOutException;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.remoting.impl.ssl.SSLSupport;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQConnectionTimedOutException;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
index 6bca584152..2bf605bd52 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.ssl;
+package org.apache.activemq.artemis.tests.integration.ssl;
 
 import javax.net.ssl.SSLPeerUnverifiedException;
 import java.util.Arrays;
@@ -23,28 +23,28 @@ import java.util.HashMap;
 import java.util.Map;
 
 import io.netty.handler.ssl.SslHandler;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnection;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -111,9 +111,9 @@ public class CoreClientOverTwoWaySSLTest extends ServiceTestBase
                   System.out.println("Passed through....");
                   NettyConnection nettyConnection = (NettyConnection) connection.getTransportConnection();
                   SslHandler sslHandler = (SslHandler) nettyConnection.getChannel().pipeline().get("ssl");
-                  assertNotNull(sslHandler);
-                  assertNotNull(sslHandler.engine().getSession());
-                  assertNotNull(sslHandler.engine().getSession().getPeerCertificateChain());
+                  Assert.assertNotNull(sslHandler);
+                  Assert.assertNotNull(sslHandler.engine().getSession());
+                  Assert.assertNotNull(sslHandler.engine().getSession().getPeerCertificateChain());
                }
             }
             catch (SSLPeerUnverifiedException e)
@@ -177,7 +177,7 @@ public class CoreClientOverTwoWaySSLTest extends ServiceTestBase
       }
       catch (ActiveMQException e)
       {
-         fail("Invalid Exception type:" + e.getType());
+         Assert.fail("Invalid Exception type:" + e.getType());
       }
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ConcurrentStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/ConcurrentStompTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ConcurrentStompTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/ConcurrentStompTest.java
index eb1678ad49..1da07231e6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ConcurrentStompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/ConcurrentStompTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp;
+package org.apache.activemq.artemis.tests.integration.stomp;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -25,7 +25,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.core.protocol.stomp.Stomp;
+import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/ExtraStompTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/ExtraStompTest.java
index cf27406e3a..6c3eedf704 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/ExtraStompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/ExtraStompTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp;
+package org.apache.activemq.artemis.tests.integration.stomp;
 
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
@@ -26,34 +26,33 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.stomp.Stomp;
-import org.apache.activemq.core.protocol.stomp.StompFrame;
-import org.apache.activemq.core.protocol.stomp.StompFrameInterceptor;
-import org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.TopicConfigurationImpl;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.integration.largemessage.LargeMessageTestBase;
-import org.apache.activemq.tests.integration.largemessage.LargeMessageTestBase.TestLargeMessageInputStream;
-import org.apache.activemq.tests.integration.stomp.util.ClientStompFrame;
-import org.apache.activemq.tests.integration.stomp.util.StompClientConnection;
-import org.apache.activemq.tests.integration.stomp.util.StompClientConnectionFactory;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.tests.integration.largemessage.LargeMessageTestBase;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
+import org.apache.activemq.artemis.core.protocol.stomp.StompFrame;
+import org.apache.activemq.artemis.core.protocol.stomp.StompFrameInterceptor;
+import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.TopicConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.integration.stomp.util.ClientStompFrame;
+import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnection;
+import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionFactory;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -426,7 +425,7 @@ public class ExtraStompTest extends StompTestBase
 
          setUpAfterServer(true);
 
-         TestLargeMessageInputStream input = new TestLargeMessageInputStream(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, true);
+         LargeMessageTestBase.TestLargeMessageInputStream input = new LargeMessageTestBase.TestLargeMessageInputStream(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, true);
          LargeMessageTestBase.adjustLargeCompression(true, input, ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE);
 
          char[] contents = input.toArray();
@@ -498,7 +497,7 @@ public class ExtraStompTest extends StompTestBase
 
          setUpAfterServer(true);
 
-         TestLargeMessageInputStream input = new TestLargeMessageInputStream(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, true);
+         LargeMessageTestBase.TestLargeMessageInputStream input = new LargeMessageTestBase.TestLargeMessageInputStream(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, true);
          LargeMessageTestBase.adjustLargeCompression(true, input, ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE);
 
          char[] contents = input.toArray();
@@ -561,7 +560,7 @@ public class ExtraStompTest extends StompTestBase
 
          setUpAfterServer(true);
 
-         TestLargeMessageInputStream input = new TestLargeMessageInputStream(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, true);
+         LargeMessageTestBase.TestLargeMessageInputStream input = new LargeMessageTestBase.TestLargeMessageInputStream(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, true);
          input.setSize(10 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE);
          LargeMessageTestBase.adjustLargeCompression(false, input, 10 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE);
 
@@ -625,7 +624,7 @@ public class ExtraStompTest extends StompTestBase
 
          setUpAfterServer(true);
 
-         TestLargeMessageInputStream input = new TestLargeMessageInputStream(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, true);
+         LargeMessageTestBase.TestLargeMessageInputStream input = new LargeMessageTestBase.TestLargeMessageInputStream(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, true);
          input.setSize(10 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE);
          LargeMessageTestBase.adjustLargeCompression(false, input, 10 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE);
 
@@ -873,10 +872,10 @@ public class ExtraStompTest extends StompTestBase
       try
       {
          List incomingInterceptorList = new ArrayList();
-         incomingInterceptorList.add("org.apache.activemq.tests.integration.stomp.ExtraStompTest$MyIncomingStompFrameInterceptor");
-         incomingInterceptorList.add("org.apache.activemq.tests.integration.stomp.ExtraStompTest$MyCoreInterceptor");
+         incomingInterceptorList.add("org.apache.activemq.artemis.tests.integration.stomp.ExtraStompTest$MyIncomingStompFrameInterceptor");
+         incomingInterceptorList.add("org.apache.activemq.artemis.tests.integration.stomp.ExtraStompTest$MyCoreInterceptor");
          List outgoingInterceptorList = new ArrayList();
-         outgoingInterceptorList.add("org.apache.activemq.tests.integration.stomp.ExtraStompTest$MyOutgoingStompFrameInterceptor");
+         outgoingInterceptorList.add("org.apache.activemq.artemis.tests.integration.stomp.ExtraStompTest$MyOutgoingStompFrameInterceptor");
 
          server = createServerWithStompInterceptor(incomingInterceptorList, outgoingInterceptorList);
          server.start();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompConnectionCleanupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompConnectionCleanupTest.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompConnectionCleanupTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompConnectionCleanupTest.java
index f2cdd86ab2..81efed9e11 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompConnectionCleanupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompConnectionCleanupTest.java
@@ -14,17 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp;
+package org.apache.activemq.artemis.tests.integration.stomp;
 
 import org.junit.Test;
 
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
 
-import org.junit.Assert;
-
-import org.apache.activemq.core.protocol.stomp.Stomp;
-import org.apache.activemq.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
 
 public class StompConnectionCleanupTest extends StompTestBase
 {
@@ -41,7 +39,7 @@ public class StompConnectionCleanupTest extends StompTestBase
 
       System.out.println("Received frame: " + frame);
 
-      Assert.assertTrue(frame.startsWith("CONNECTED"));
+      assertTrue(frame.startsWith("CONNECTED"));
 
       frame = "SUBSCRIBE\n" + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "ack:auto\n\n" + Stomp.NULL;
       sendFrame(frame);
@@ -50,8 +48,8 @@ public class StompConnectionCleanupTest extends StompTestBase
       sendFrame(frame);
 
       frame = receiveFrame(10000);
-      Assert.assertTrue(frame.startsWith("MESSAGE"));
-      Assert.assertTrue(frame.indexOf("destination:") > 0);
+      assertTrue(frame.startsWith("MESSAGE"));
+      assertTrue(frame.indexOf("destination:") > 0);
 
       // Now we wait until the connection is cleared on the server, which will happen some time after ttl, since no data
       // is being sent
@@ -89,7 +87,7 @@ public class StompConnectionCleanupTest extends StompTestBase
 
       //We send and consumer a message to ensure a STOMP connection and server session is created
 
-      Assert.assertTrue(frame.startsWith("CONNECTED"));
+      assertTrue(frame.startsWith("CONNECTED"));
 
       MessageConsumer consumer = session.createConsumer(queue);
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompOverHttpTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompOverHttpTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompOverHttpTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompOverHttpTest.java
index 8faebfdc93..d0e2a374b6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompOverHttpTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompOverHttpTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp;
+package org.apache.activemq.artemis.tests.integration.stomp;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompOverWebsocketTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompOverWebsocketTest.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompOverWebsocketTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompOverWebsocketTest.java
index 7a7a2c130a..5503ff6d3a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompOverWebsocketTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompOverWebsocketTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp;
+package org.apache.activemq.artemis.tests.integration.stomp;
 
 
 import java.net.URI;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
index b32e1bf944..eb5eb9a61b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp;
+package org.apache.activemq.artemis.tests.integration.stomp;
 
 import javax.jms.BytesMessage;
 import javax.jms.DeliveryMode;
@@ -30,12 +30,12 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.core.protocol.stomp.Stomp;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
index 937b85d2f7..1ea8764b6b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp;
+package org.apache.activemq.artemis.tests.integration.stomp;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -49,26 +49,26 @@ import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.string.StringDecoder;
 import io.netty.handler.codec.string.StringEncoder;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.TopicConfigurationImpl;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.TopicConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompWebSocketTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWebSocketTest.java
similarity index 73%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompWebSocketTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWebSocketTest.java
index 63a9e6e57b..547386cf0d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompWebSocketTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWebSocketTest.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp;
+package org.apache.activemq.artemis.tests.integration.stomp;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/AbstractClientStompFrame.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/AbstractClientStompFrame.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java
index 7cd92c49c1..d223d9b6fa 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/AbstractClientStompFrame.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/AbstractStompClientConnection.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/AbstractStompClientConnection.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
index edcb45fdcf..14bc16584d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/AbstractStompClientConnection.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrame.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrame.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrame.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrame.java
index 44d1babc34..d56fb717e2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrame.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrame.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.nio.ByteBuffer;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV10.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV10.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV10.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV10.java
index 0fbc6fdf03..24805bd3f5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV10.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV10.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 /**
  * pls use factory to create frames.
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV11.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV11.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java
index 1af3ec6116..cbff90a9b9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV11.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 /**
  *         pls use factory to create frames.
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV12.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV12.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV12.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV12.java
index 0b17088ead..de57e4691f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/ClientStompFrameV12.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV12.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 /**
  */
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnection.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnection.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnection.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnection.java
index 0cd9892f94..111339f283 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnection.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnection.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.io.IOException;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionFactory.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionFactory.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionFactory.java
index 94fd7e70b8..7d3dc8dff3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionFactory.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.io.IOException;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV10.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV10.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV10.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV10.java
index 1224f40fa5..52b3eb832c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV10.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV10.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.io.IOException;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV11.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV11.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
index bfa4ed24ca..d6d5225cc6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV11.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.io.IOException;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV12.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV12.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV12.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV12.java
index 54e712340d..d8a1b6964d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompClientConnectionV12.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV12.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.io.IOException;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactory.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactory.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactory.java
index aab1e25a85..c795261729 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactory.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 public interface StompFrameFactory
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryFactory.java
similarity index 94%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryFactory.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryFactory.java
index 26629042af..a0cece82ed 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryFactory.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 public class StompFrameFactoryFactory
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV10.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV10.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV10.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV10.java
index 13c2d1a725..ee9cb4ff70 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV10.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV10.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.util.StringTokenizer;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV11.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV11.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java
index 301df09fc8..51dbde8f88 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV11.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.util.StringTokenizer;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV12.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV12.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java
index c948fec641..978e8f9085 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/util/StompFrameFactoryV12.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.util;
+package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.util.StringTokenizer;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/ExtraStompTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java
index 47b08f9bd7..4be40a28b2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/ExtraStompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.v11;
+package org.apache.activemq.artemis.tests.integration.stomp.v11;
 
 import java.nio.charset.StandardCharsets;
 
-import org.apache.activemq.tests.integration.stomp.util.ClientStompFrame;
-import org.apache.activemq.tests.integration.stomp.util.StompClientConnection;
-import org.apache.activemq.tests.integration.stomp.util.StompClientConnectionFactory;
+import org.apache.activemq.artemis.tests.integration.stomp.util.ClientStompFrame;
+import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnection;
+import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/StompV11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
similarity index 99%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/StompV11Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
index 5117952905..fdd83f48da 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/StompV11Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.v11;
+package org.apache.activemq.artemis.tests.integration.stomp.v11;
 
 import javax.jms.BytesMessage;
 import javax.jms.DeliveryMode;
@@ -30,12 +30,12 @@ import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.stomp.util.ClientStompFrame;
-import org.apache.activemq.tests.integration.stomp.util.StompClientConnection;
-import org.apache.activemq.tests.integration.stomp.util.StompClientConnectionFactory;
-import org.apache.activemq.tests.integration.stomp.util.StompClientConnectionV11;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.stomp.util.ClientStompFrame;
+import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnection;
+import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionFactory;
+import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionV11;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/StompV11TestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
similarity index 79%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/StompV11TestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
index b264c4f413..abeaa899b3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v11/StompV11TestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
@@ -14,8 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.v11;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
+package org.apache.activemq.artemis.tests.integration.stomp.v11;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
 import org.junit.Before;
 import org.junit.After;
 
@@ -33,24 +35,22 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.TopicConfigurationImpl;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.TopicConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
 
 public abstract class StompV11TestBase extends UnitTestCase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v12/StompV12Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v12/StompV12Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
index 7a308afdbc..ae7b556342 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/v12/StompV12Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.stomp.v12;
+package org.apache.activemq.artemis.tests.integration.stomp.v12;
 
 import javax.jms.BytesMessage;
 import javax.jms.DeliveryMode;
@@ -31,14 +31,14 @@ import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.stomp.util.ClientStompFrame;
-import org.apache.activemq.tests.integration.stomp.util.StompClientConnection;
-import org.apache.activemq.tests.integration.stomp.util.StompClientConnectionFactory;
-import org.apache.activemq.tests.integration.stomp.util.StompClientConnectionV11;
-import org.apache.activemq.tests.integration.stomp.util.StompClientConnectionV12;
-import org.apache.activemq.tests.integration.stomp.v11.StompV11TestBase;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.stomp.util.ClientStompFrame;
+import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnection;
+import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionFactory;
+import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionV11;
+import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionV12;
+import org.apache.activemq.artemis.tests.integration.stomp.v11.StompV11TestBase;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -87,9 +87,9 @@ public class StompV12Test extends StompV11TestBase
 
       connection.connect(defUser, defPass);
 
-      assertTrue(connection.isConnected());
+      Assert.assertTrue(connection.isConnected());
 
-      assertEquals("1.0", connection.getVersion());
+      Assert.assertEquals("1.0", connection.getVersion());
 
       connection.disconnect();
 
@@ -97,9 +97,9 @@ public class StompV12Test extends StompV11TestBase
 
       connection.connect(defUser, defPass);
 
-      assertTrue(connection.isConnected());
+      Assert.assertTrue(connection.isConnected());
 
-      assertEquals("1.2", connection.getVersion());
+      Assert.assertEquals("1.2", connection.getVersion());
 
       connection.disconnect();
 
@@ -107,13 +107,13 @@ public class StompV12Test extends StompV11TestBase
 
       connection.connect();
 
-      assertFalse(connection.isConnected());
+      Assert.assertFalse(connection.isConnected());
 
       //new way of connection
       StompClientConnectionV11 conn = (StompClientConnectionV11) StompClientConnectionFactory.createClientConnection("1.1", hostname, port);
       conn.connect1(defUser, defPass);
 
-      assertTrue(conn.isConnected());
+      Assert.assertTrue(conn.isConnected());
 
       conn.disconnect();
    }
@@ -131,8 +131,8 @@ public class StompV12Test extends StompV11TestBase
 
       ClientStompFrame reply = conn.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
-      assertEquals("1.2", reply.getHeader("version"));
+      Assert.assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("1.2", reply.getHeader("version"));
 
       conn.disconnect();
 
@@ -147,8 +147,8 @@ public class StompV12Test extends StompV11TestBase
 
       reply = conn.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
-      assertEquals("1.2", reply.getHeader("version"));
+      Assert.assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("1.2", reply.getHeader("version"));
 
       conn.disconnect();
    }
@@ -165,10 +165,10 @@ public class StompV12Test extends StompV11TestBase
 
       ClientStompFrame reply = conn.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("CONNECTED", reply.getCommand());
 
       //reply headers: version, session, server
-      assertEquals(null, reply.getHeader("version"));
+      Assert.assertEquals(null, reply.getHeader("version"));
 
       conn.disconnect();
 
@@ -182,10 +182,10 @@ public class StompV12Test extends StompV11TestBase
 
       reply = conn.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("CONNECTED", reply.getCommand());
 
       //reply headers: version, session, server
-      assertEquals("1.0", reply.getHeader("version"));
+      Assert.assertEquals("1.0", reply.getHeader("version"));
 
       conn.disconnect();
 
@@ -199,10 +199,10 @@ public class StompV12Test extends StompV11TestBase
 
       reply = conn.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("CONNECTED", reply.getCommand());
 
       //reply headers: version, session, server
-      assertEquals("1.1", reply.getHeader("version"));
+      Assert.assertEquals("1.1", reply.getHeader("version"));
 
       conn.disconnect();
 
@@ -216,10 +216,10 @@ public class StompV12Test extends StompV11TestBase
 
       reply = conn.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("CONNECTED", reply.getCommand());
 
       //reply headers: version, session, server
-      assertEquals("1.1", reply.getHeader("version"));
+      Assert.assertEquals("1.1", reply.getHeader("version"));
 
       conn.disconnect();
 
@@ -233,7 +233,7 @@ public class StompV12Test extends StompV11TestBase
 
       reply = conn.sendFrame(frame);
 
-      assertEquals("ERROR", reply.getCommand());
+      Assert.assertEquals("ERROR", reply.getCommand());
 
       System.out.println("Got error frame " + reply);
 
@@ -250,18 +250,18 @@ public class StompV12Test extends StompV11TestBase
 
       ClientStompFrame response = connV12.sendFrame(frame);
 
-      assertNull(response);
+      Assert.assertNull(response);
 
       frame.addHeader("receipt", "1234");
       frame.setBody("Hello World 2!");
 
       response = connV12.sendFrame(frame);
 
-      assertNotNull(response);
+      Assert.assertNotNull(response);
 
-      assertEquals("RECEIPT", response.getCommand());
+      Assert.assertEquals("RECEIPT", response.getCommand());
 
-      assertEquals("1234", response.getHeader("receipt-id"));
+      Assert.assertEquals("1234", response.getHeader("receipt-id"));
 
       //subscribe
       StompClientConnection newConn = StompClientConnectionFactory.createClientConnection("1.2", hostname, port);
@@ -278,16 +278,16 @@ public class StompV12Test extends StompV11TestBase
 
       System.out.println("received " + frame);
 
-      assertEquals("MESSAGE", frame.getCommand());
+      Assert.assertEquals("MESSAGE", frame.getCommand());
 
-      assertEquals("a-sub", frame.getHeader("subscription"));
+      Assert.assertEquals("a-sub", frame.getHeader("subscription"));
 
       //'auto' ack mode doesn't require 'ack' header
-      assertNull(frame.getHeader("ack"));
+      Assert.assertNull(frame.getHeader("ack"));
 
-      assertEquals(getQueuePrefix() + getQueueName(), frame.getHeader("destination"));
+      Assert.assertEquals(getQueuePrefix() + getQueueName(), frame.getHeader("destination"));
 
-      assertEquals("Hello World 1!", frame.getBody());
+      Assert.assertEquals("Hello World 1!", frame.getBody());
 
       frame = newConn.receiveFrame();
 
@@ -327,9 +327,9 @@ public class StompV12Test extends StompV11TestBase
 
       System.out.println("received " + frame);
 
-      assertEquals("MESSAGE", frame.getCommand());
+      Assert.assertEquals("MESSAGE", frame.getCommand());
 
-      assertEquals("application/xml", frame.getHeader("content-type"));
+      Assert.assertEquals("application/xml", frame.getHeader("content-type"));
 
       //unsub
       ClientStompFrame unsubFrame = newConn.createFrame("UNSUBSCRIBE");
@@ -367,10 +367,10 @@ public class StompV12Test extends StompV11TestBase
 
       frame = newConn.receiveFrame();
 
-      assertEquals("MESSAGE", frame.getCommand());
-      assertEquals(body, frame.getBody());
+      Assert.assertEquals("MESSAGE", frame.getCommand());
+      Assert.assertEquals(body, frame.getBody());
 
-      assertEquals(cLen, frame.getHeader("content-length"));
+      Assert.assertEquals(cLen, frame.getHeader("content-length"));
 
       //send again without content-length header
       frame = connV12.createFrame("SEND");
@@ -384,11 +384,11 @@ public class StompV12Test extends StompV11TestBase
       //receive again. extra should received.
       frame = newConn.receiveFrame();
 
-      assertEquals(body + "extra", frame.getBody());
+      Assert.assertEquals(body + "extra", frame.getBody());
 
       //although sender didn't send the content-length header,
       //the server should add it anyway
-      assertEquals((body + "extra").getBytes(StandardCharsets.UTF_8).length, Integer.valueOf(frame.getHeader("content-length")).intValue());
+      Assert.assertEquals((body + "extra").getBytes(StandardCharsets.UTF_8).length, Integer.valueOf(frame.getHeader("content-length")).intValue());
 
       //unsub
       ClientStompFrame unsubFrame = newConn.createFrame("UNSUBSCRIBE");
@@ -436,11 +436,11 @@ public class StompV12Test extends StompV11TestBase
 
       frame = newConn.receiveFrame();
 
-      assertEquals("MESSAGE", frame.getCommand());
-      assertEquals(body, frame.getBody());
+      Assert.assertEquals("MESSAGE", frame.getCommand());
+      Assert.assertEquals(body, frame.getBody());
 
       System.out.println("received: " + frame);
-      assertEquals("value1", frame.getHeader("foo"));
+      Assert.assertEquals("value1", frame.getHeader("foo"));
 
       //unsub
       ClientStompFrame unsubFrame = newConn.createFrame("UNSUBSCRIBE");
@@ -463,7 +463,7 @@ public class StompV12Test extends StompV11TestBase
       frame.setBody(body);
 
       ClientStompFrame reply = connV12.sendFrame(frame);
-      assertEquals("ERROR", reply.getCommand());
+      Assert.assertEquals("ERROR", reply.getCommand());
    }
 
    //padding shouldn't be trimmed
@@ -503,17 +503,17 @@ public class StompV12Test extends StompV11TestBase
 
       frame = newConn.receiveFrame();
 
-      assertEquals("MESSAGE", frame.getCommand());
-      assertEquals(body, frame.getBody());
+      Assert.assertEquals("MESSAGE", frame.getCommand());
+      Assert.assertEquals(body, frame.getBody());
 
       System.out.println("received: " + frame);
-      assertEquals(null, frame.getHeader("header1"));
-      assertEquals("value1 ", frame.getHeader(" header1"));
-      assertEquals("value2   ", frame.getHeader("  header2"));
-      assertEquals(" value3", frame.getHeader("header3 "));
-      assertEquals(" value4 ", frame.getHeader(" header4 "));
-      assertEquals(" value 5 ", frame.getHeader(" header 5  "));
-      assertEquals("\t value\t 6 \t", frame.getHeader("header6"));
+      Assert.assertEquals(null, frame.getHeader("header1"));
+      Assert.assertEquals("value1 ", frame.getHeader(" header1"));
+      Assert.assertEquals("value2   ", frame.getHeader("  header2"));
+      Assert.assertEquals(" value3", frame.getHeader("header3 "));
+      Assert.assertEquals(" value4 ", frame.getHeader(" header4 "));
+      Assert.assertEquals(" value 5 ", frame.getHeader(" header 5  "));
+      Assert.assertEquals("\t value\t 6 \t", frame.getHeader("header6"));
 
       //unsub
       ClientStompFrame unsubFrame = newConn.createFrame("UNSUBSCRIBE");
@@ -562,11 +562,11 @@ public class StompV12Test extends StompV11TestBase
 
       System.out.println("received " + frame);
 
-      assertEquals("MESSAGE", frame.getCommand());
+      Assert.assertEquals("MESSAGE", frame.getCommand());
 
       String value = frame.getHeader("\r" + "special-header" + "\\" + "\n" + ":" + "\r\n");
 
-      assertEquals(":" + "\\" + "\n" + "good\n\r", value);
+      Assert.assertEquals(":" + "\\" + "\n" + "good\n\r", value);
 
       //unsub
       ClientStompFrame unsubFrame = newConn.createFrame("UNSUBSCRIBE");
@@ -587,11 +587,11 @@ public class StompV12Test extends StompV11TestBase
 
       ClientStompFrame reply = conn.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("CONNECTED", reply.getCommand());
 
       Thread.sleep(5000);
 
-      assertEquals(0, conn.getFrameQueueSize());
+      Assert.assertEquals(0, conn.getFrameQueueSize());
 
       conn.disconnect();
 
@@ -606,13 +606,13 @@ public class StompV12Test extends StompV11TestBase
 
       reply = conn.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("CONNECTED", reply.getCommand());
 
-      assertEquals("0,0", reply.getHeader("heart-beat"));
+      Assert.assertEquals("0,0", reply.getHeader("heart-beat"));
 
       Thread.sleep(5000);
 
-      assertEquals(0, conn.getFrameQueueSize());
+      Assert.assertEquals(0, conn.getFrameQueueSize());
 
       conn.disconnect();
 
@@ -627,9 +627,9 @@ public class StompV12Test extends StompV11TestBase
 
       reply = conn.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("CONNECTED", reply.getCommand());
 
-      assertEquals("0,500", reply.getHeader("heart-beat"));
+      Assert.assertEquals("0,500", reply.getHeader("heart-beat"));
 
       Thread.sleep(2000);
 
@@ -643,7 +643,7 @@ public class StompV12Test extends StompV11TestBase
       try
       {
          conn.sendFrame(frame);
-         fail("connection should have been destroyed by now");
+         Assert.fail("connection should have been destroyed by now");
       }
       catch (IOException e)
       {
@@ -661,9 +661,9 @@ public class StompV12Test extends StompV11TestBase
 
       reply = conn.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("CONNECTED", reply.getCommand());
 
-      assertEquals("0,500", reply.getHeader("heart-beat"));
+      Assert.assertEquals("0,500", reply.getHeader("heart-beat"));
 
       conn.startPinger(500);
 
@@ -697,8 +697,8 @@ public class StompV12Test extends StompV11TestBase
 
       ClientStompFrame reply = connV12.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
-      assertEquals("500,500", reply.getHeader("heart-beat"));
+      Assert.assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("500,500", reply.getHeader("heart-beat"));
 
       connV12.disconnect();
 
@@ -713,9 +713,9 @@ public class StompV12Test extends StompV11TestBase
 
       reply = connV12.sendFrame(frame);
 
-      assertEquals("CONNECTED", reply.getCommand());
+      Assert.assertEquals("CONNECTED", reply.getCommand());
 
-      assertEquals("1000,500", reply.getHeader("heart-beat"));
+      Assert.assertEquals("1000,500", reply.getHeader("heart-beat"));
 
       connV12.startPinger(500);
 
@@ -726,7 +726,7 @@ public class StompV12Test extends StompV11TestBase
 
       System.out.println("ping received: " + size);
 
-      assertTrue("size: " + size, size > 5);
+      Assert.assertTrue("size: " + size, size > 5);
 
       //now server side should be disconnected because we didn't send ping for 2 sec
       frame = connV12.createFrame("SEND");
@@ -791,7 +791,7 @@ public class StompV12Test extends StompV11TestBase
             frame = newConn.receiveFrame(5000);
          }
 
-         assertEquals(10, cnt);
+         Assert.assertEquals(10, cnt);
 
          // unsub
          ClientStompFrame unsubFrame = newConn.createFrame("UNSUBSCRIBE");
@@ -856,7 +856,7 @@ public class StompV12Test extends StompV11TestBase
             frame = newConn.receiveFrame(5000);
          }
 
-         assertEquals(10, cnt);
+         Assert.assertEquals(10, cnt);
 
          // unsub
          ClientStompFrame unsubFrame = newConn.createFrame("UNSUBSCRIBE");
@@ -930,7 +930,7 @@ public class StompV12Test extends StompV11TestBase
             Thread.sleep(500);
             frame = newConn.receiveFrame(5000);
          }
-         assertEquals(10, cnt);
+         Assert.assertEquals(10, cnt);
 
          // unsub
          ClientStompFrame unsubFrame = newConn.createFrame("UNSUBSCRIBE");
@@ -987,7 +987,7 @@ public class StompV12Test extends StompV11TestBase
 
       ClientStompFrame error = connV12.receiveFrame();
 
-      assertEquals("ERROR", error.getCommand());
+      Assert.assertEquals("ERROR", error.getCommand());
 
       unsubscribe(connV12, "sub1");
 
@@ -1010,9 +1010,9 @@ public class StompV12Test extends StompV11TestBase
 
       ClientStompFrame frame = connV12.receiveFrame();
 
-      assertNotNull(frame);
+      Assert.assertNotNull(frame);
 
-      assertNotNull(frame.getHeader("ack"));
+      Assert.assertNotNull(frame.getHeader("ack"));
 
       nack(connV12, "someother");
 
@@ -1043,7 +1043,7 @@ public class StompV12Test extends StompV11TestBase
 
       String messageID = frame.getHeader("ack");
 
-      assertNotNull(messageID);
+      Assert.assertNotNull(messageID);
 
       ack(connV12, messageID, null);
 
@@ -1070,7 +1070,7 @@ public class StompV12Test extends StompV11TestBase
 
       String messageID = frame.getHeader("ack");
 
-      assertNotNull(messageID);
+      Assert.assertNotNull(messageID);
 
       ClientStompFrame ackFrame = connV12.createFrame("ACK");
 
@@ -1078,7 +1078,7 @@ public class StompV12Test extends StompV11TestBase
 
       frame = connV12.receiveFrame();
 
-      assertEquals("ERROR", frame.getCommand());
+      Assert.assertEquals("ERROR", frame.getCommand());
 
       unsubscribe(connV12, "sub1");
 
@@ -1087,7 +1087,7 @@ public class StompV12Test extends StompV11TestBase
       //message still there.
       MessageConsumer consumer = session.createConsumer(queue);
       Message message = consumer.receive(1000);
-      assertNotNull(message);
+      Assert.assertNotNull(message);
    }
 
    @Test
@@ -1101,7 +1101,7 @@ public class StompV12Test extends StompV11TestBase
 
       ClientStompFrame frame = connV12.receiveFrame();
 
-      assertNotNull(frame);
+      Assert.assertNotNull(frame);
 
       ack(connV12, "someother", null);
 
@@ -1143,9 +1143,9 @@ public class StompV12Test extends StompV11TestBase
 
       System.out.println("Receiver error: " + error);
 
-      assertEquals("ERROR", error.getCommand());
+      Assert.assertEquals("ERROR", error.getCommand());
 
-      assertEquals("answer-me", error.getHeader("receipt-id"));
+      Assert.assertEquals("answer-me", error.getHeader("receipt-id"));
 
       unsubscribe(connV12, "sub1");
 
@@ -1181,9 +1181,9 @@ public class StompV12Test extends StompV11TestBase
 
       System.out.println("Receiver error: " + error);
 
-      assertEquals("ERROR", error.getCommand());
+      Assert.assertEquals("ERROR", error.getCommand());
 
-      assertEquals("answer-me", error.getHeader("receipt-id"));
+      Assert.assertEquals("answer-me", error.getHeader("receipt-id"));
 
       unsubscribe(connV12, "sub1");
 
@@ -1214,7 +1214,7 @@ public class StompV12Test extends StompV11TestBase
       for (int i = 0; i < num; i++)
       {
          frame = connV12.receiveFrame();
-         assertNotNull(frame);
+         Assert.assertNotNull(frame);
       }
 
       //ack the last
@@ -1249,7 +1249,7 @@ public class StompV12Test extends StompV11TestBase
       for (int i = 0; i < num; i++)
       {
          frame = connV12.receiveFrame();
-         assertNotNull(frame);
+         Assert.assertNotNull(frame);
 
          //ack the 49th
          if (i == num - 2)
@@ -1290,7 +1290,7 @@ public class StompV12Test extends StompV11TestBase
       for (int i = 0; i < num; i++)
       {
          frame = connV12.receiveFrame();
-         assertNotNull(frame);
+         Assert.assertNotNull(frame);
       }
 
       unsubscribe(connV12, "sub1");
@@ -1322,7 +1322,7 @@ public class StompV12Test extends StompV11TestBase
       for (int i = 0; i < num; i++)
       {
          frame = connV12.receiveFrame();
-         assertNotNull(frame);
+         Assert.assertNotNull(frame);
       }
 
       unsubscribe(connV12, "sub1");
@@ -1354,7 +1354,7 @@ public class StompV12Test extends StompV11TestBase
       for (int i = 0; i < num; i++)
       {
          frame = connV12.receiveFrame();
-         assertNotNull(frame);
+         Assert.assertNotNull(frame);
 
          System.out.println(i + " == received: " + frame);
          //ack on even numbers
@@ -1407,14 +1407,14 @@ public class StompV12Test extends StompV11TestBase
       frame = connV12.receiveFrame(1000);
 
       System.out.println("received frame : " + frame);
-      assertEquals("Hello World", frame.getBody());
-      assertEquals("sub1", frame.getHeader("subscription"));
+      Assert.assertEquals("Hello World", frame.getBody());
+      Assert.assertEquals("sub1", frame.getHeader("subscription"));
 
       frame = newConn.receiveFrame(1000);
 
       System.out.println("received 2 frame : " + frame);
-      assertEquals("Hello World", frame.getBody());
-      assertEquals("sub2", frame.getHeader("subscription"));
+      Assert.assertEquals("Hello World", frame.getBody());
+      Assert.assertEquals("sub2", frame.getHeader("subscription"));
 
       // remove suscription
       this.unsubscribe(connV12, "sub1", true);
@@ -1442,8 +1442,8 @@ public class StompV12Test extends StompV11TestBase
 
       ClientStompFrame frame = connV12_2.receiveFrame(2000);
 
-      assertEquals("MESSAGE", frame.getCommand());
-      assertEquals("Hello World", frame.getBody());
+      Assert.assertEquals("MESSAGE", frame.getCommand());
+      Assert.assertEquals("Hello World", frame.getBody());
 
       connV12.disconnect();
       connV12_2.disconnect();
@@ -1511,7 +1511,7 @@ public class StompV12Test extends StompV11TestBase
 
       frame = connV12.receiveFrame(500);
 
-      assertNull(frame);
+      Assert.assertNull(frame);
 
       this.unsubscribe(connV12, getName());
 
@@ -1532,7 +1532,7 @@ public class StompV12Test extends StompV11TestBase
 
       if (result == null || (!"RECEIPT".equals(result.getCommand())) || (!"1".equals(result.getHeader("receipt-id"))))
       {
-         fail("Disconnect failed! " + result);
+         Assert.fail("Disconnect failed! " + result);
       }
 
       final CountDownLatch latch = new CountDownLatch(1);
@@ -1585,7 +1585,7 @@ public class StompV12Test extends StompV11TestBase
       }
       thr.join();
 
-      assertTrue("Server failed to disconnect.", count == 0);
+      Assert.assertTrue("Server failed to disconnect.", count == 0);
    }
 
    @Test
@@ -1617,7 +1617,7 @@ public class StompV12Test extends StompV11TestBase
 
       if (result == null || (!"RECEIPT".equals(result.getCommand())) || (!"1".equals(result.getHeader("receipt-id"))))
       {
-         fail("Disconnect failed! " + result);
+         Assert.fail("Disconnect failed! " + result);
       }
 
       // send the message when the durable subscriber is disconnected
@@ -1729,7 +1729,7 @@ public class StompV12Test extends StompV11TestBase
 
       ClientStompFrame frame = connV12.receiveFrame();
 
-      assertTrue(frame.getCommand().equals("MESSAGE"));
+      Assert.assertTrue(frame.getCommand().equals("MESSAGE"));
 
       connV12.disconnect();
 
@@ -1761,7 +1761,7 @@ public class StompV12Test extends StompV11TestBase
             }
             catch (JMSException e)
             {
-               fail("here failed");
+               Assert.fail("here failed");
                e.printStackTrace();
             }
          }
@@ -1776,7 +1776,7 @@ public class StompV12Test extends StompV11TestBase
          connV12.sendFrame(frame);
       }
 
-      assertTrue(latch.await(60, TimeUnit.SECONDS));
+      Assert.assertTrue(latch.await(60, TimeUnit.SECONDS));
 
       connV12.disconnect();
    }
@@ -1828,11 +1828,11 @@ public class StompV12Test extends StompV11TestBase
       BytesMessage message = (BytesMessage) consumer.receive(10000);
       Assert.assertNotNull(message);
 
-      assertEquals(data.length, message.getBodyLength());
-      assertEquals(data[0], message.readByte());
-      assertEquals(data[1], message.readByte());
-      assertEquals(data[2], message.readByte());
-      assertEquals(data[3], message.readByte());
+      Assert.assertEquals(data.length, message.getBodyLength());
+      Assert.assertEquals(data[0], message.readByte());
+      Assert.assertEquals(data[1], message.readByte());
+      Assert.assertEquals(data[2], message.readByte());
+      Assert.assertEquals(data[3], message.readByte());
    }
 
    @Test
@@ -1882,7 +1882,7 @@ public class StompV12Test extends StompV11TestBase
       long tmsg = message.getJMSTimestamp();
       Assert.assertTrue(Math.abs(tnow - tmsg) < 1000);
 
-      assertNull(consumer.receive(1000));
+      Assert.assertNull(consumer.receive(1000));
 
       connV12.disconnect();
    }
@@ -1901,8 +1901,8 @@ public class StompV12Test extends StompV11TestBase
 
       frame = connV12.sendFrame(frame);
 
-      assertTrue(frame.getCommand().equals("RECEIPT"));
-      assertEquals("1234", frame.getHeader("receipt-id"));
+      Assert.assertTrue(frame.getCommand().equals("RECEIPT"));
+      Assert.assertEquals("1234", frame.getHeader("receipt-id"));
 
       TextMessage message = (TextMessage) consumer.receive(1000);
       Assert.assertNotNull(message);
@@ -2015,7 +2015,7 @@ public class StompV12Test extends StompV11TestBase
       sendMessage(getName(), topic);
 
       frame = connV12.receiveFrame(1000);
-      assertNull(frame);
+      Assert.assertNull(frame);
 
       connV12.disconnect();
    }
@@ -2037,7 +2037,7 @@ public class StompV12Test extends StompV11TestBase
 
       frame = connV12.receiveFrame(2000);
 
-      assertNull(frame);
+      Assert.assertNull(frame);
 
       // send message on another JMS connection => it should be received
       sendMessage(getName(), topic);
@@ -2088,15 +2088,15 @@ public class StompV12Test extends StompV11TestBase
 
       ClientStompFrame frame = connV12.receiveFrame();
 
-      assertEquals("MESSAGE", frame.getCommand());
+      Assert.assertEquals("MESSAGE", frame.getCommand());
 
       System.out.println("Message: " + frame);
 
-      assertEquals("5", frame.getHeader("content-length"));
+      Assert.assertEquals("5", frame.getHeader("content-length"));
 
-      assertEquals(null, frame.getHeader("type"));
+      Assert.assertEquals(null, frame.getHeader("type"));
 
-      assertEquals(frame.getBody(), new String(payload, StandardCharsets.UTF_8));
+      Assert.assertEquals(frame.getBody(), new String(payload, StandardCharsets.UTF_8));
 
       connV12.disconnect();
    }
@@ -2244,10 +2244,10 @@ public class StompV12Test extends StompV11TestBase
 
       frame = connV12.sendFrame(frame);
 
-      assertEquals("123", frame.getHeader("receipt-id"));
+      Assert.assertEquals("123", frame.getHeader("receipt-id"));
 
       // check the message is not committed
-      assertNull(consumer.receive(100));
+      Assert.assertNull(consumer.receive(100));
 
       this.commitTransaction(connV12, "tx1", true);
 
@@ -2319,7 +2319,7 @@ public class StompV12Test extends StompV11TestBase
       sendMessage("second message");
 
       frame = connV12.receiveFrame(1000);
-      assertNull(frame);
+      Assert.assertNull(frame);
 
       connV12.disconnect();
    }
@@ -2350,7 +2350,7 @@ public class StompV12Test extends StompV11TestBase
       connV12.connect(defUser, defPass);
 
       frame = connV12.receiveFrame(1000);
-      assertNull("not expected: " + frame, frame);
+      Assert.assertNull("not expected: " + frame, frame);
 
       //subscribe again.
       this.subscribe(connV12, "sub1", "auto");
@@ -2358,16 +2358,16 @@ public class StompV12Test extends StompV11TestBase
       // receive message from socket
       frame = connV12.receiveFrame();
 
-      assertNotNull(frame);
+      Assert.assertNotNull(frame);
       Assert.assertTrue(frame.getCommand().equals("MESSAGE"));
 
       frame = connV12.receiveFrame(1000);
-      assertNull("not expected: " + frame, frame);
+      Assert.assertNull("not expected: " + frame, frame);
 
       this.unsubscribe(connV12, "sub1", true);
 
       frame = connV12.receiveFrame(1000);
-      assertNull(frame);
+      Assert.assertNull(frame);
 
       connV12.disconnect();
    }
@@ -2406,7 +2406,7 @@ public class StompV12Test extends StompV11TestBase
       ClientStompFrame resp = conn.sendFrame(beginFrame);
       if (receipt)
       {
-         assertEquals("1234", resp.getHeader("receipt-id"));
+         Assert.assertEquals("1234", resp.getHeader("receipt-id"));
       }
    }
 
@@ -2496,7 +2496,7 @@ public class StompV12Test extends StompV11TestBase
 
       if (receipt)
       {
-         assertEquals("1234", subFrame.getHeader("receipt-id"));
+         Assert.assertEquals("1234", subFrame.getHeader("receipt-id"));
       }
    }
 
@@ -2539,7 +2539,7 @@ public class StompV12Test extends StompV11TestBase
 
       if (receipt)
       {
-         assertTrue(frame.getHeader("receipt-id").equals("1234"));
+         Assert.assertTrue(frame.getHeader("receipt-id").equals("1234"));
       }
    }
 
@@ -2567,8 +2567,8 @@ public class StompV12Test extends StompV11TestBase
       if (receipt)
       {
          System.out.println("response: " + f);
-         assertEquals("RECEIPT", f.getCommand());
-         assertEquals("4321", f.getHeader("receipt-id"));
+         Assert.assertEquals("RECEIPT", f.getCommand());
+         Assert.assertEquals("4321", f.getHeader("receipt-id"));
       }
    }
 
@@ -2637,8 +2637,8 @@ public class StompV12Test extends StompV11TestBase
 
       frame = connV12.sendFrame(frame);
 
-      assertTrue(frame.getCommand().equals("ERROR"));
-      assertEquals("1234", frame.getHeader("receipt-id"));
+      Assert.assertTrue(frame.getCommand().equals("ERROR"));
+      Assert.assertEquals("1234", frame.getHeader("receipt-id"));
       System.out.println("message: " + frame.getHeader("message"));
 
       connV12.disconnect();
@@ -2657,8 +2657,8 @@ public class StompV12Test extends StompV11TestBase
 
       frame = connV12.sendFrame(frame);
 
-      assertTrue(frame.getCommand().equals("RECEIPT"));
-      assertEquals("1234", frame.getHeader("receipt-id"));
+      Assert.assertTrue(frame.getCommand().equals("RECEIPT"));
+      Assert.assertEquals("1234", frame.getHeader("receipt-id"));
       System.out.println("message: " + frame.getHeader("message"));
 
       connV12.disconnect();
@@ -2677,7 +2677,7 @@ public class StompV12Test extends StompV11TestBase
 
          frame = connV12.sendFrame(frame);
 
-         assertTrue(frame.getCommand().equals("ERROR"));
+         Assert.assertTrue(frame.getCommand().equals("ERROR"));
       }
       finally
       {
@@ -2698,7 +2698,7 @@ public class StompV12Test extends StompV11TestBase
       frame.setBody("Hello World 1!");
 
       ClientStompFrame response = connV12.sendFrame(frame);
-      assertNull(response);
+      Assert.assertNull(response);
 
       //subscribe
       ClientStompFrame subFrame = connV12.createFrame("SUBSCRIBE");
@@ -2712,11 +2712,11 @@ public class StompV12Test extends StompV11TestBase
 
       System.out.println("Received: " + frame);
 
-      assertEquals("MESSAGE", frame.getCommand());
-      assertEquals("ID:MYMACHINE-50616-635482262727823605-1:1:1:1", frame.getHeader("subscription"));
-      assertNotNull(frame.getHeader("message-id"));
-      assertEquals(getQueuePrefix() + getQueueName(), frame.getHeader("destination"));
-      assertEquals("Hello World 1!", frame.getBody());
+      Assert.assertEquals("MESSAGE", frame.getCommand());
+      Assert.assertEquals("ID:MYMACHINE-50616-635482262727823605-1:1:1:1", frame.getHeader("subscription"));
+      Assert.assertNotNull(frame.getHeader("message-id"));
+      Assert.assertEquals(getQueuePrefix() + getQueueName(), frame.getHeader("destination"));
+      Assert.assertEquals("Hello World 1!", frame.getBody());
 
       //unsub
       ClientStompFrame unsubFrame = connV12.createFrame("UNSUBSCRIBE");
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/tools/TransferMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/tools/TransferMessageTest.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/tools/TransferMessageTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/tools/TransferMessageTest.java
index 8e111fdf09..83d28b65f1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/tools/TransferMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/tools/TransferMessageTest.java
@@ -14,25 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.tools;
+package org.apache.activemq.artemis.tests.integration.tools;
 
 import java.util.ArrayList;
 import java.util.Map;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.postoffice.impl.PostOfficeImpl;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.Consumer;
-import org.apache.activemq.core.server.cluster.impl.ClusterConnectionBridge;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase;
-import org.apache.activemq.tools.Main;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.Consumer;
+import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionBridge;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.tools.Main;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -174,7 +175,7 @@ public class TransferMessageTest extends ClusterTestBase
          for (int i = 0; i < NUM_MESSAGES; i++)
          {
             ClientMessage msg = consumer.receive(5000);
-            assertNotNull(msg);
+            Assert.assertNotNull(msg);
             msg.acknowledge();
 
             if (i % 100 == 0)
@@ -183,7 +184,7 @@ public class TransferMessageTest extends ClusterTestBase
             }
          }
 
-         assertNull(consumer.receiveImmediate());
+         Assert.assertNull(consumer.receiveImmediate());
 
          session.commit();
 
@@ -346,7 +347,7 @@ public class TransferMessageTest extends ClusterTestBase
          for (int i = 0; i < NUM_MESSAGES; i++)
          {
             ClientMessage msg = consumer.receive(5000);
-            assertNotNull(msg);
+            Assert.assertNotNull(msg);
             msg.acknowledge();
 
             if (i % 100 == 0)
@@ -356,7 +357,7 @@ public class TransferMessageTest extends ClusterTestBase
          }
 
 
-         assertNull(consumer.receiveImmediate());
+         Assert.assertNull(consumer.receiveImmediate());
 
          session.commit();
 
@@ -379,7 +380,7 @@ public class TransferMessageTest extends ClusterTestBase
          for (int i = 0; i < 1000; i++)
          {
             ClientMessage msg = consumer.receive(5000);
-            assertNotNull(msg);
+            Assert.assertNotNull(msg);
             msg.acknowledge();
 
             if (i % 100 == 0)
@@ -388,7 +389,7 @@ public class TransferMessageTest extends ClusterTestBase
             }
          }
 
-         assertNull(consumer.receiveImmediate());
+         Assert.assertNull(consumer.receiveImmediate());
 
          session.commit();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/ActiveMQFrameDecoder2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/ActiveMQFrameDecoder2Test.java
similarity index 95%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/ActiveMQFrameDecoder2Test.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/ActiveMQFrameDecoder2Test.java
index c27ce77be1..ee638843d6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/ActiveMQFrameDecoder2Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/ActiveMQFrameDecoder2Test.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.transports.netty;
+package org.apache.activemq.artemis.tests.integration.transports.netty;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,8 +23,8 @@ import java.util.Random;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.embedded.EmbeddedChannel;
-import org.apache.activemq.core.remoting.impl.netty.ActiveMQFrameDecoder2;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.remoting.impl.netty.ActiveMQFrameDecoder2;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
similarity index 81%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
index 563f683d0e..d3b2582ad2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.transports.netty;
+package org.apache.activemq.artemis.tests.integration.transports.netty;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,26 +33,26 @@ import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpRequestDecoder;
 import io.netty.handler.codec.http.HttpResponseEncoder;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor;
-import org.apache.activemq.core.remoting.impl.netty.PartialPooledByteBufAllocator;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor;
+import org.apache.activemq.artemis.core.remoting.impl.netty.PartialPooledByteBufAllocator;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -60,11 +60,11 @@ import org.junit.Test;
 import static io.netty.handler.codec.http.HttpHeaders.Names.UPGRADE;
 import static io.netty.handler.codec.http.HttpResponseStatus.SWITCHING_PROTOCOLS;
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
-import static org.apache.activemq.core.remoting.impl.netty.NettyConnector.MAGIC_NUMBER;
-import static org.apache.activemq.core.remoting.impl.netty.NettyConnector.SEC_ACTIVEMQ_REMOTING_ACCEPT;
-import static org.apache.activemq.core.remoting.impl.netty.NettyConnector.SEC_ACTIVEMQ_REMOTING_KEY;
-import static org.apache.activemq.core.remoting.impl.netty.NettyConnector.createExpectedResponse;
-import static org.apache.activemq.tests.util.RandomUtil.randomString;
+import static org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector.MAGIC_NUMBER;
+import static org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector.SEC_ACTIVEMQ_REMOTING_ACCEPT;
+import static org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector.SEC_ACTIVEMQ_REMOTING_KEY;
+import static org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector.createExpectedResponse;
+import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString;
 
 /**
  * Test that Netty Connector can connect to a Web Server and upgrade from a HTTP request to its remoting protocol.
@@ -183,7 +183,7 @@ public class NettyConnectorWithHTTPUpgradeTest extends UnitTestCase
          e = x;
       }
 
-      // make sure we failed *before* the HTTP hand-shake timeout elapsed (which is hard-coded to 30 seconds, see org.apache.activemq.core.remoting.impl.netty.NettyConnector.HttpUpgradeHandler.awaitHandshake())
+      // make sure we failed *before* the HTTP hand-shake timeout elapsed (which is hard-coded to 30 seconds, see org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector.HttpUpgradeHandler.awaitHandshake())
       assertTrue((System.currentTimeMillis() - start) < 30000);
       assertNotNull(e);
       assertTrue(e instanceof ActiveMQNotConnectedException);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/vertx/ActiveMQVertxUnitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/vertx/ActiveMQVertxUnitTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/vertx/ActiveMQVertxUnitTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/vertx/ActiveMQVertxUnitTest.java
index b601298796..f0ef01b386 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/vertx/ActiveMQVertxUnitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/vertx/ActiveMQVertxUnitTest.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.vertx;
+package org.apache.activemq.artemis.tests.integration.vertx;
 
 import java.util.HashMap;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ConnectorServiceConfiguration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.integration.vertx.VertxConstants;
-import org.apache.activemq.integration.vertx.VertxIncomingConnectorServiceFactory;
-import org.apache.activemq.integration.vertx.VertxOutgoingConnectorServiceFactory;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.integration.vertx.VertxConstants;
+import org.apache.activemq.artemis.integration.vertx.VertxIncomingConnectorServiceFactory;
+import org.apache.activemq.artemis.integration.vertx.VertxOutgoingConnectorServiceFactory;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
similarity index 97%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaRecoveryTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
index 57ac303dfa..2141bfa178 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaRecoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.xa;
+package org.apache.activemq.artemis.tests.integration.xa;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -24,26 +24,26 @@ import javax.management.MBeanServerFactory;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.QueueControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.jms.client.ActiveMQBytesMessage;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.jms.client.ActiveMQBytesMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaTest.java
similarity index 96%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaTest.java
index 826910a5d3..3fa8b81208 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.xa;
+package org.apache.activemq.artemis.tests.integration.xa;
 
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
@@ -24,23 +24,23 @@ import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.ra.ActiveMQRAXAResource;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.ra.ActiveMQRAXAResource;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -665,7 +665,7 @@ public class BasicXaTest extends ServiceTestBase
    }
 
    /**
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     * @throws XAException
     */
    protected void multipleQueuesInternalTest(final boolean createQueues,
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/XaTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/XaTimeoutTest.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/XaTimeoutTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/XaTimeoutTest.java
index 573ec84310..3bcdbb37ef 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/XaTimeoutTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/XaTimeoutTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.integration.xa;
+package org.apache.activemq.artemis.tests.integration.xa;
 
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
@@ -26,31 +26,31 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAStartMessage;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.core.transaction.Transaction;
-import org.apache.activemq.core.transaction.TransactionOperationAbstract;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAStartMessage;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.transaction.Transaction;
+import org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -712,7 +712,7 @@ public class XaTimeoutTest extends UnitTestCase
       {
 
          /* (non-Javadoc)
-          * @see org.apache.activemq.api.core.Interceptor#intercept(org.apache.activemq.core.protocol.core.Packet, org.apache.activemq.spi.core.protocol.RemotingConnection)
+          * @see Interceptor#intercept(org.apache.activemq.artemis.core.protocol.core.Packet, RemotingConnection)
           */
          @Override
          public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JMSClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JMSClusteredTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
index d61570737d..daa49bff16 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JMSClusteredTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.util;
+package org.apache.activemq.artemis.tests.util;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.Queue;
@@ -26,20 +26,20 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.config.ClusterConnectionConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
 import org.junit.After;
 import org.junit.Before;
 
@@ -298,7 +298,7 @@ public class JMSClusteredTestBase extends ServiceTestBase
    {
       Map params = new HashMap();
 
-      params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node);
+      params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node);
 
       return params;
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JMSTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java
similarity index 89%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JMSTestBase.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java
index ea15bbea24..30912c7cf4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JMSTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.util;
+package org.apache.activemq.artemis.tests.util;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -34,19 +34,19 @@ import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.QueueControl;
-import org.apache.activemq.api.jms.management.JMSQueueControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.service.extensions.ServiceUtils;
-import org.apache.activemq.tests.integration.ra.DummyTransactionManager;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.service.extensions.ServiceUtils;
+import org.apache.activemq.artemis.tests.integration.ra.DummyTransactionManager;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JournalExample.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JournalExample.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JournalExample.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JournalExample.java
index b9babd22ab..d5df68eea8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/JournalExample.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JournalExample.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.util;
+package org.apache.activemq.artemis.tests.util;
 
 import java.util.ArrayList;
 
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.utils.TimeAndCounterIDGenerator;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.utils.TimeAndCounterIDGenerator;
 
 /**
  * A JournalExample: Just an example on how to use the Journal Directly
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/NonSerializableFactory.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/NonSerializableFactory.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/util/NonSerializableFactory.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/NonSerializableFactory.java
index 2980306270..337675c627 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/NonSerializableFactory.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/NonSerializableFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.util;
+package org.apache.activemq.artemis.tests.util;
 
 import javax.naming.Context;
 import javax.naming.Name;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/ReplicatedBackupUtils.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/ReplicatedBackupUtils.java
similarity index 88%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/util/ReplicatedBackupUtils.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/ReplicatedBackupUtils.java
index 4d61320692..ba20df8a07 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/ReplicatedBackupUtils.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/ReplicatedBackupUtils.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.util;
+package org.apache.activemq.artemis.tests.util;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration;
-import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
 
 public final class ReplicatedBackupUtils
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/TransportConfigurationUtils.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/TransportConfigurationUtils.java
similarity index 91%
rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/util/TransportConfigurationUtils.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/TransportConfigurationUtils.java
index a204a7b364..c7e80604d5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/TransportConfigurationUtils.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/TransportConfigurationUtils.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.util;
+package org.apache.activemq.artemis.tests.util;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
 
 public final class TransportConfigurationUtils
 {
@@ -103,7 +103,7 @@ public final class TransportConfigurationUtils
       {
          Map serverParams = new HashMap();
          Integer port = live ? 61616 : 5545;
-         serverParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port);
+         serverParams.put(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port);
          return new TransportConfiguration(classname, serverParams);
       }
 
@@ -118,7 +118,7 @@ public final class TransportConfigurationUtils
       {
          Map serverParams = new HashMap();
          Integer port = live ? 61616 : 5545;
-         serverParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port);
+         serverParams.put(org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port);
          return new TransportConfiguration(classname, serverParams, name);
       }
 
diff --git a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/transactions/DummyTransactionManagerLocator.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/transactions/DummyTransactionManagerLocator.java
similarity index 93%
rename from activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/transactions/DummyTransactionManagerLocator.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/transactions/DummyTransactionManagerLocator.java
index 10970315a7..0db3fc6ac1 100644
--- a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/transactions/DummyTransactionManagerLocator.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/transactions/DummyTransactionManagerLocator.java
@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.service.extensions.tests.transactions;
-
-import org.apache.activemq.service.extensions.transactions.TransactionManagerLocator;
+package org.apache.activemq.artemis.tests.util.transactions;
 
 import javax.transaction.HeuristicMixedException;
 import javax.transaction.HeuristicRollbackException;
@@ -27,6 +25,8 @@ import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
+import org.apache.activemq.artemis.service.extensions.transactions.TransactionManagerLocator;
+
 public class DummyTransactionManagerLocator implements TransactionManagerLocator,TransactionManager
 {
    @Override
diff --git a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/transactions/TransactionManagerLocatorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/transactions/TransactionManagerLocatorTest.java
similarity index 89%
rename from activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/transactions/TransactionManagerLocatorTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/transactions/TransactionManagerLocatorTest.java
index f928423b4b..46bf1d5bc8 100644
--- a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/transactions/TransactionManagerLocatorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/transactions/TransactionManagerLocatorTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.service.extensions.tests.transactions;
+package org.apache.activemq.artemis.tests.util.transactions;
 
-import org.apache.activemq.service.extensions.ServiceUtils;
+import org.apache.activemq.artemis.service.extensions.ServiceUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.artemis.service.extensions.transactions.TransactionManagerLocator b/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.artemis.service.extensions.transactions.TransactionManagerLocator
new file mode 100644
index 0000000000..e8247ad51b
--- /dev/null
+++ b/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.artemis.service.extensions.transactions.TransactionManagerLocator
@@ -0,0 +1 @@
+org.apache.activemq.artemis.tests.util.transactions.DummyTransactionManagerLocator
diff --git a/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator b/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator
deleted file mode 100644
index 209f66f801..0000000000
--- a/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.activemq.tests.util.transactions.DummyTransactionManagerLocator
diff --git a/tests/integration-tests/src/test/resources/restricted-security-client.policy b/tests/integration-tests/src/test/resources/restricted-security-client.policy
index b9b631799c..48048c873e 100644
--- a/tests/integration-tests/src/test/resources/restricted-security-client.policy
+++ b/tests/integration-tests/src/test/resources/restricted-security-client.policy
@@ -23,8 +23,8 @@ grant {
         permission java.net.SocketPermission "*:1024-", "connect";
         // Note1: normally, we don't need this permission since the applet allows reading jars loaded by the applet
         // Note2: Which of the following two java.io.FilePermission is necessary depends on the exact Maven command
-        permission java.io.FilePermission "${user.dir}/activemq-core-client/target/classes/-", "read";
-        permission java.io.FilePermission "${user.dir}/activemq-core-client/target/activemq-core-client-${project.version}.jar", "read";
+        permission java.io.FilePermission "${user.dir}/artemis-core-client/target/classes/-", "read";
+        permission java.io.FilePermission "${user.dir}/artemis-core-client/target/artemis-core-client-${project.version}.jar", "read";
         permission java.util.PropertyPermission "activemq.version.property.filename", "read";
         permission java.util.PropertyPermission "io.netty.eventLoopThreads", "read";
         permission java.util.PropertyPermission "io.netty.noUnsafe", "read";
@@ -35,6 +35,24 @@ grant {
         permission java.util.PropertyPermission "io.netty.selectorAutoRebuildThreshold", "read";
         permission java.util.PropertyPermission "io.netty.initialSeedUniquifier", "read";
         permission java.util.PropertyPermission "io.netty.noResourceLeakDetection", "read";
+        permission java.util.PropertyPermission "io.netty.tmpdir", "read";
+        permission java.util.PropertyPermission "io.netty.bitMode", "read";
+        permission java.util.PropertyPermission "io.netty.leakDetectionLevel", "read";
+        permission java.util.PropertyPermission "io.netty.allocator.pageSize", "read";
+        permission java.util.PropertyPermission "io.netty.allocator.maxOrder", "read";
+        permission java.util.PropertyPermission "io.netty.allocator.numHeapArenas", "read";
+        permission java.util.PropertyPermission "io.netty.allocator.numDirectArenas", "read";
+        permission java.util.PropertyPermission "io.netty.allocator.tinyCacheSize", "read";
+        permission java.util.PropertyPermission "io.netty.allocator.smallCacheSize", "read";
+        permission java.util.PropertyPermission "io.netty.allocator.normalCacheSize", "read";
+        permission java.util.PropertyPermission "io.netty.allocator.maxCachedBufferCapacity", "read";
+        permission java.util.PropertyPermission "io.netty.allocator.cacheTrimInterval", "read";
+        permission java.util.PropertyPermission "io.netty.allocator.type", "read";
+        permission java.util.PropertyPermission "io.netty.threadLocalDirectBufferSize", "read";
+        permission java.util.PropertyPermission "io.netty.recycler.maxCapacity.default", "read";
+        permission java.util.PropertyPermission "java.io.tmpdir", "read";
+        permission java.util.PropertyPermission "sun.arch.data.model", "read";
+        permission java.util.PropertyPermission "sun.nio.ch.bugLevel", "read";
         permission java.lang.RuntimePermission "setContextClassLoader";
         permission java.lang.RuntimePermission "accessDeclaredMembers";
 };
diff --git a/tests/integration-tests/src/test/resources/spring-jms-beans.xml b/tests/integration-tests/src/test/resources/spring-jms-beans.xml
index f92a69ffde..1d5bce32b6 100644
--- a/tests/integration-tests/src/test/resources/spring-jms-beans.xml
+++ b/tests/integration-tests/src/test/resources/spring-jms-beans.xml
@@ -20,26 +20,26 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-   
+   
        
    
 
-   
+   
       
       
-         
-            
+         
+            
          
       
    
 
-   
+   
       
    
 
-    
-    
-    
+    
+
+    
         
         
     
@@ -49,7 +49,6 @@
         
         
     
-    
+
 
 
-    
\ No newline at end of file
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index ed5c0a46fd..27c6d0eb74 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -18,8 +18,8 @@
    4.0.0
    
       org.apache.activemq.tests
-      activemq-tests-pom
-      10.0.0-SNAPSHOT
+      artemis-tests-pom
+      1.0.0-SNAPSHOT
    
 
    jms-tests
@@ -33,14 +33,14 @@
    
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
          test
          test-jar
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
          test
          test-jar
@@ -54,27 +54,27 @@
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-commons
+         artemis-commons
          ${project.version}
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
          org.apache.activemq
-         activemq-ra
+         artemis-ra
          ${project.version}
       
       
          org.apache.activemq
-         activemq-bootstrap
+         artemis-bootstrap
          ${project.version}
       
       
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/AcknowledgementTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/AcknowledgementTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
index 3fa79167d0..341cda5c2f 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/AcknowledgementTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -31,7 +31,7 @@ import javax.jms.TopicSession;
 import javax.jms.TopicSubscriber;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
similarity index 95%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
index 823d346cb6..323789f274 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -36,16 +36,16 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.tests.tools.ServerManagement;
-import org.apache.activemq.jms.tests.tools.container.Server;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.tests.tools.ServerManagement;
+import org.apache.activemq.artemis.jms.tests.tools.container.Server;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -185,7 +185,7 @@ public abstract class ActiveMQServerTestCase
 
    public String getContextFactory()
    {
-      return org.apache.activemq.jms.tests.tools.container.InVMInitialContextFactory.class.getCanonicalName();
+      return org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory.class.getCanonicalName();
    }
 
    public void start() throws Exception
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/AutoAckMesageListenerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMesageListenerTest.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/AutoAckMesageListenerTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMesageListenerTest.java
index c34d1bf359..4634969fa9 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/AutoAckMesageListenerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMesageListenerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/BrowserTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java
similarity index 95%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/BrowserTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java
index 2d5f060a49..d22fc09284 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/BrowserTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 import java.util.Enumeration;
 
 import javax.jms.Connection;
@@ -27,10 +27,10 @@ import javax.jms.QueueBrowser;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/CTSMiscellaneousTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/CTSMiscellaneousTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java
index ac5ad5ae8e..61b4ecbeeb 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/CTSMiscellaneousTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,9 +23,9 @@ import javax.jms.DeliveryMode;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionClosedTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
index b863fde8e9..87328a21b9 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionClosedTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -28,7 +28,7 @@ import javax.jms.TopicConnectionFactory;
 import javax.jms.TopicSession;
 import javax.jms.TopicSubscriber;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 /**
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionFactoryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionFactoryTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
index df1f941e3c..98fcdcc408 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionFactoryTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -39,9 +39,9 @@ import javax.jms.XAQueueConnectionFactory;
 import javax.jms.XATopicConnection;
 import javax.jms.XATopicConnectionFactory;
 
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
index 76b111edb6..4b6c1f420a 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConnectionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionMetaData;
@@ -26,7 +26,7 @@ import javax.jms.ServerSessionPool;
 import javax.jms.Session;
 import javax.jms.TopicConnection;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConsumerClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConsumerClosedTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
index 3ab2c9ad56..39b1e8f6d7 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ConsumerClosedTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.MessageConsumer;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DeliveryOrderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DeliveryOrderTest.java
similarity index 97%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DeliveryOrderTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DeliveryOrderTest.java
index 4d9157228d..874b22a787 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DeliveryOrderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DeliveryOrderTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DurableSubscriptionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DurableSubscriptionTest.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DurableSubscriptionTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DurableSubscriptionTest.java
index 4ba2aa4461..484cddacc7 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/DurableSubscriptionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DurableSubscriptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -30,7 +30,7 @@ import javax.jms.Topic;
 import javax.jms.TopicSubscriber;
 import java.util.List;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 /**
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JMSTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JMSTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java
index 8bed28ae1b..464be83602 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JMSTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -28,7 +28,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JMSTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTestCase.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JMSTestCase.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTestCase.java
index 6a7f10d7bd..c7875182be 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JMSTestCase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTestCase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 import java.util.ArrayList;
 
 import javax.jms.Connection;
@@ -26,11 +26,11 @@ import javax.jms.TopicConnection;
 import javax.jms.XAConnection;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQQueueConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQTopicConnectionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQQueueConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQTopicConnectionFactory;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JmsTestLogger.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JmsTestLogger.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JmsTestLogger.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JmsTestLogger.java
index b28776da0d..3b7042d292 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/JmsTestLogger.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JmsTestLogger.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageConsumerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageConsumerTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
index d075687124..3add320d78 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageConsumerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -44,8 +44,8 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageProducerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageProducerTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
index c216ea43ba..d4933deb24 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageProducerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.CompletionListener;
 import javax.jms.Connection;
@@ -31,10 +31,10 @@ import java.io.Serializable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.jms.tests.message.SimpleJMSMessage;
-import org.apache.activemq.jms.tests.message.SimpleJMSTextMessage;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.jms.tests.message.SimpleJMSMessage;
+import org.apache.activemq.artemis.jms.tests.message.SimpleJMSTextMessage;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class MessageProducerTest extends JMSTestCase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageWithReadResolveTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
similarity index 97%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageWithReadResolveTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
index 257c5705e7..fbd6ae6ede 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MessageWithReadResolveTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -24,7 +24,7 @@ import javax.jms.ObjectMessage;
 import javax.jms.Session;
 import java.io.Serializable;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 /**
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MiscellaneousTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MiscellaneousTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java
index e93df25a42..0c1babf01d 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/MiscellaneousTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 import java.util.Enumeration;
 
 import javax.jms.Connection;
@@ -27,7 +27,7 @@ import javax.jms.QueueBrowser;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/NonDurableSubscriberTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/NonDurableSubscriberTest.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/NonDurableSubscriberTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/NonDurableSubscriberTest.java
index a5e94d42cd..8f32358c72 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/NonDurableSubscriberTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/NonDurableSubscriberTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.InvalidSelectorException;
 import javax.jms.Session;
@@ -22,7 +22,7 @@ import javax.jms.TopicConnection;
 import javax.jms.TopicSession;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 /**
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/PersistenceTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/PersistenceTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
index 9ba359939b..df1015e28d 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/PersistenceTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -23,7 +23,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class PersistenceTest extends JMSTestCase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/QueueReceiverTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueReceiverTest.java
similarity index 94%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/QueueReceiverTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueReceiverTest.java
index 0dab047942..cd1ebd27eb 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/QueueReceiverTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueReceiverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.QueueConnection;
 import javax.jms.QueueReceiver;
@@ -23,7 +23,7 @@ import javax.jms.QueueSession;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class QueueReceiverTest extends JMSTestCase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/QueueTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/QueueTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java
index 9bc3483fcc..064f6d1e14 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/QueueTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -26,7 +26,7 @@ import javax.jms.TextMessage;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class QueueTest extends JMSTestCase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ReferenceableTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ReferenceableTest.java
similarity index 89%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ReferenceableTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ReferenceableTest.java
index 2eb7dcbfb1..96579168e9 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ReferenceableTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ReferenceableTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -27,14 +27,14 @@ import javax.naming.Reference;
 import javax.naming.Referenceable;
 import java.io.Serializable;
 
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQQueue;
-import org.apache.activemq.jms.client.ActiveMQTopic;
-import org.apache.activemq.jms.referenceable.ConnectionFactoryObjectFactory;
-import org.apache.activemq.jms.referenceable.DestinationObjectFactory;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
+import org.apache.activemq.artemis.jms.client.ActiveMQTopic;
+import org.apache.activemq.artemis.jms.referenceable.ConnectionFactoryObjectFactory;
+import org.apache.activemq.artemis.jms.referenceable.DestinationObjectFactory;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 /**
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/SecurityTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SecurityTest.java
similarity index 97%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/SecurityTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SecurityTest.java
index 72add30959..c033501188 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/SecurityTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SecurityTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -22,7 +22,7 @@ import javax.jms.IllegalStateException;
 import javax.jms.JMSSecurityException;
 import javax.jms.Session;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 /**
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/SessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/SessionTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
index d6e19ffe59..ef1a246818 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/SessionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -33,9 +33,9 @@ import javax.jms.TopicSession;
 import javax.jms.XAConnection;
 import javax.jms.XASession;
 
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class SessionTest extends ActiveMQServerTestCase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TemporaryDestinationTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TemporaryDestinationTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
index b8c3286e7a..c5f377524f 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TemporaryDestinationTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -27,7 +27,7 @@ import javax.jms.TemporaryTopic;
 import javax.jms.TextMessage;
 import javax.naming.NamingException;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class TemporaryDestinationTest extends JMSTestCase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TopicTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java
similarity index 97%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TopicTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java
index 04f1130b2b..9c1cc82aad 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TopicTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -28,7 +28,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import java.io.Serializable;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class TopicTest extends JMSTestCase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TransactedSessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TransactedSessionTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
index 525093350b..30d22d8e2b 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/TransactedSessionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests;
+package org.apache.activemq.artemis.jms.tests;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -28,7 +28,7 @@ import javax.jms.TextMessage;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/BodyIsAssignableFromTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BodyIsAssignableFromTest.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/BodyIsAssignableFromTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BodyIsAssignableFromTest.java
index 20b6ffd84d..4ce9fc9af7 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/BodyIsAssignableFromTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BodyIsAssignableFromTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.BytesMessage;
 import javax.jms.JMSException;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/BytesMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BytesMessageTest.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/BytesMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BytesMessageTest.java
index 228a17797b..bb1e93ad95 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/BytesMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BytesMessageTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.BytesMessage;
 import javax.jms.JMSException;
 import javax.jms.Message;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ExpiredMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ExpiredMessageTest.java
similarity index 95%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ExpiredMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ExpiredMessageTest.java
index 88aa97518d..e443c6689d 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ExpiredMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ExpiredMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.Connection;
 import javax.jms.Message;
@@ -23,8 +23,8 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.jms.tests.JMSTestCase;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.JMSTestCase;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class ExpiredMessageTest extends JMSTestCase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSCorrelationIDHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSCorrelationIDHeaderTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java
index fcd4976377..ee5a460437 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSCorrelationIDHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.Message;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class JMSCorrelationIDHeaderTest extends MessageHeaderTestBase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSDeliveryModeHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java
similarity index 95%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSDeliveryModeHeaderTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java
index 5fc3bc66d0..3b64d8d30a 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSDeliveryModeHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import org.junit.Test;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Message;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 
 public class JMSDeliveryModeHeaderTest extends MessageHeaderTestBase
 {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSDestinationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDestinationHeaderTest.java
similarity index 93%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSDestinationHeaderTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDestinationHeaderTest.java
index 9a9df05248..218d7a0dce 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSDestinationHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDestinationHeaderTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.Message;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class JMSDestinationHeaderTest extends MessageHeaderTestBase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSExpirationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
similarity index 97%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSExpirationHeaderTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
index 77cd83dcf5..e37e5ae409 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSExpirationHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Message;
 
-import org.apache.activemq.jms.client.ActiveMQMessage;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSMessageIDHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSMessageIDHeaderTest.java
similarity index 95%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSMessageIDHeaderTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSMessageIDHeaderTest.java
index 65e23666b6..abe3116014 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSMessageIDHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSMessageIDHeaderTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.Message;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class JMSMessageIDHeaderTest extends MessageHeaderTestBase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSPriorityHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSPriorityHeaderTest.java
similarity index 97%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSPriorityHeaderTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSPriorityHeaderTest.java
index 9489515ad8..e1f79f3ae1 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSPriorityHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSPriorityHeaderTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -23,8 +23,8 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.jms.tests.ActiveMQServerTestCase;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.ActiveMQServerTestCase;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class JMSPriorityHeaderTest extends ActiveMQServerTestCase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSReplyToHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java
similarity index 94%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSReplyToHeaderTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java
index fb9f4b4ec8..bec664caba 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSReplyToHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import org.junit.Test;
 
 import javax.jms.Message;
 import javax.jms.TemporaryQueue;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 
 /**
  *
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSTimestampHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTimestampHeaderTest.java
similarity index 94%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSTimestampHeaderTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTimestampHeaderTest.java
index b935e52118..2b76aea054 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSTimestampHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTimestampHeaderTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import org.junit.Test;
 
 import javax.jms.Message;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 
 public class JMSTimestampHeaderTest extends MessageHeaderTestBase
 {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSTypeHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java
similarity index 94%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSTypeHeaderTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java
index a41fd58127..2948554e81 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSTypeHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import org.junit.Test;
 
 import javax.jms.Message;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 
 public class JMSTypeHeaderTest extends MessageHeaderTestBase
 {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MapMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MapMessageTest.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MapMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MapMessageTest.java
index b47c2481c9..ff3f73ebda 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MapMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MapMessageTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.JMSException;
 import javax.jms.MapMessage;
 import javax.jms.Message;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageBodyTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageBodyTest.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageBodyTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageBodyTest.java
index 3f482c0724..8b3db76bcd 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageBodyTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageBodyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.BytesMessage;
 import javax.jms.MapMessage;
@@ -29,7 +29,7 @@ import java.io.Serializable;
 import java.util.Enumeration;
 import java.util.HashSet;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageBodyTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageBodyTestCase.java
similarity index 94%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageBodyTestCase.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageBodyTestCase.java
index 289fdc36f1..fe9b8ad7a5 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageBodyTestCase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageBodyTestCase.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 import javax.jms.Connection;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.activemq.jms.tests.ActiveMQServerTestCase;
+import org.apache.activemq.artemis.jms.tests.ActiveMQServerTestCase;
 import org.junit.Before;
 
 public abstract class MessageBodyTestCase extends ActiveMQServerTestCase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
similarity index 95%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
index 9d06571f2b..3e311397d7 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import java.io.File;
 import java.io.Serializable;
@@ -37,26 +37,26 @@ import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.FailoverEventListener;
-import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq.api.core.client.SessionFailureListener;
-import org.apache.activemq.core.client.impl.ClientMessageImpl;
-import org.apache.activemq.core.remoting.FailureListener;
-import org.apache.activemq.jms.client.ActiveMQBytesMessage;
-import org.apache.activemq.jms.client.ActiveMQMapMessage;
-import org.apache.activemq.jms.client.ActiveMQMessage;
-import org.apache.activemq.jms.client.ActiveMQObjectMessage;
-import org.apache.activemq.jms.client.ActiveMQStreamMessage;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.FailoverEventListener;
+import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
+import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl;
+import org.apache.activemq.artemis.core.remoting.FailureListener;
+import org.apache.activemq.artemis.jms.client.ActiveMQBytesMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQMapMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQObjectMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQStreamMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class MessageHeaderTest extends MessageHeaderTestBase
@@ -1387,7 +1387,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.api.core.client.ClientSession#createTransportBuffer(byte[])
+       * @see ClientSession#createTransportBuffer(byte[])
        */
       public ActiveMQBuffer createBuffer(final byte[] bytes)
       {
@@ -1396,7 +1396,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.api.core.client.ClientSession#createTransportBuffer(int)
+       * @see ClientSession#createTransportBuffer(int)
        */
       public ActiveMQBuffer createBuffer(final int size)
       {
@@ -1418,7 +1418,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.api.core.client.ClientSession#createQueue(org.apache.activemq.utils.SimpleString, org.apache.activemq.utils.SimpleString)
+       * @see ClientSession#createQueue(org.apache.activemq.utils.SimpleString, org.apache.activemq.utils.SimpleString)
        */
       public void createQueue(SimpleString address, SimpleString queueName) throws ActiveMQException
       {
@@ -1427,7 +1427,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.api.core.client.ClientSession#setClientID(java.lang.String)
+       * @see ClientSession#setClientID(java.lang.String)
        */
       public void setClientID(String clientID)
       {
@@ -1436,7 +1436,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.api.core.client.ClientSession#addMetaData(java.lang.String, java.lang.String)
+       * @see ClientSession#addMetaData(java.lang.String, java.lang.String)
        */
       public void addMetaData(String key, String data) throws ActiveMQException
       {
@@ -1445,7 +1445,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.api.core.client.ClientSession#addUniqueMetaData(java.lang.String, java.lang.String)
+       * @see ClientSession#addUniqueMetaData(java.lang.String, java.lang.String)
        */
       public void addUniqueMetaData(String key, String data) throws ActiveMQException
       {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
similarity index 95%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTestBase.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
index e2ad0c166a..70987899ec 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTestBase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 import java.util.Arrays;
 import java.util.Enumeration;
 
@@ -32,15 +32,15 @@ import javax.jms.Session;
 import javax.jms.StreamMessage;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.jms.client.ActiveMQBytesMessage;
-import org.apache.activemq.jms.client.ActiveMQMapMessage;
-import org.apache.activemq.jms.client.ActiveMQMessage;
-import org.apache.activemq.jms.client.ActiveMQObjectMessage;
-import org.apache.activemq.jms.client.ActiveMQStreamMessage;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
-import org.apache.activemq.jms.tests.ActiveMQServerTestCase;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.jms.client.ActiveMQBytesMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQMapMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQObjectMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQStreamMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.jms.tests.ActiveMQServerTestCase;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Before;
 
 public abstract class MessageHeaderTestBase extends ActiveMQServerTestCase
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessagePropertyConversionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessagePropertyConversionTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java
index 42a354db23..7e05556765 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessagePropertyConversionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.Connection;
 import javax.jms.JMSContext;
@@ -27,9 +27,9 @@ import javax.jms.MessageFormatRuntimeException;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.jms.tests.ActiveMQServerTestCase;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.jms.tests.ActiveMQServerTestCase;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
similarity index 97%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageTestBase.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
index 89f4e19251..8b6529bb00 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageTestBase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
 import javax.jms.JMSException;
@@ -23,8 +23,8 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.activemq.jms.tests.ActiveMQServerTestCase;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.ActiveMQServerTestCase;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ObjectMessageDeliveryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
similarity index 95%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ObjectMessageDeliveryTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
index 00cd91397a..0d1e0d7910 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ObjectMessageDeliveryTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import org.junit.Test;
 
@@ -27,8 +27,8 @@ import javax.jms.TopicPublisher;
 import javax.jms.TopicSession;
 import javax.jms.TopicSubscriber;
 
-import org.apache.activemq.jms.tests.ActiveMQServerTestCase;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.ActiveMQServerTestCase;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 
 /**
  *
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ObjectMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageTest.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ObjectMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageTest.java
index 8cdd56bc55..c7f3246264 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/ObjectMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.DeliveryMode;
 import javax.jms.JMSException;
@@ -26,7 +26,7 @@ import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -77,7 +77,7 @@ public class ObjectMessageTest extends MessageTestBase
 
          Object testObject2 = r.getObject();
 
-         ProxyAssertSupport.assertEquals("org.apache.activemq.jms.tests.message.SomeObject", testObject2.getClass().getName());
+         ProxyAssertSupport.assertEquals("org.apache.activemq.artemis.jms.tests.message.SomeObject", testObject2.getClass().getName());
          ProxyAssertSupport.assertNotSame(testObject, testObject2);
          ProxyAssertSupport.assertNotSame(testObject.getClass(), testObject2.getClass());
          ProxyAssertSupport.assertNotSame(testObject.getClass().getClassLoader(), testObject2.getClass()
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSBytesMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSBytesMessage.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java
index 81b92dafda..3ef071ecc1 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSBytesMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSMapMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSMapMessage.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java
index 32e2244269..566ef8cb45 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSMapMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import java.util.Collections;
 import java.util.Enumeration;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSMessage.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java
index cd16e5456a..53738ba43e 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import java.util.Collections;
 import java.util.Enumeration;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSObjectMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java
similarity index 97%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSObjectMessage.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java
index b4fda0bdd1..7b3f7ad430 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSObjectMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import java.io.Serializable;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSStreamMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSStreamMessage.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java
index 329797a4a0..0bbc9b287a 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSStreamMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSTextMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java
similarity index 97%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSTextMessage.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java
index 3f580a7f7b..fac9f7f716 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SimpleJMSTextMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.JMSException;
 import javax.jms.TextMessage;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SomeObject.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SomeObject.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SomeObject.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SomeObject.java
index 6830e0571e..303661e29e 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/SomeObject.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SomeObject.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import java.io.Serializable;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/StreamMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/StreamMessageTest.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/StreamMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/StreamMessageTest.java
index 04a523214d..eb1dc4670b 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/StreamMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/StreamMessageTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.StreamMessage;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/TextMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/TextMessageTest.java
similarity index 95%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/TextMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/TextMessageTest.java
index ef998b3846..3abe2b7094 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/TextMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/TextMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message;
+package org.apache.activemq.artemis.jms.tests.message;
 import org.junit.Before;
 import org.junit.After;
 
@@ -24,7 +24,7 @@ import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 
 /**
  * A test that sends/receives text messages to the JMS provider and verifies their integrity.
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignBytesMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignBytesMessageTest.java
similarity index 89%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignBytesMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignBytesMessageTest.java
index 9dc47afc99..19f942828f 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignBytesMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignBytesMessageTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message.foreign;
+package org.apache.activemq.artemis.jms.tests.message.foreign;
 
 import javax.jms.BytesMessage;
 import javax.jms.JMSException;
 import javax.jms.Message;
 
-import org.apache.activemq.jms.tests.message.SimpleJMSBytesMessage;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.message.SimpleJMSBytesMessage;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 
 /**
  * Tests the delivery/receipt of a foreign byte message
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignMapMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMapMessageTest.java
similarity index 92%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignMapMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMapMessageTest.java
index 991b4594db..dc9553f18e 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignMapMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMapMessageTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message.foreign;
+package org.apache.activemq.artemis.jms.tests.message.foreign;
 
 import javax.jms.JMSException;
 import javax.jms.MapMessage;
 import javax.jms.Message;
 
-import org.apache.activemq.jms.tests.message.SimpleJMSMapMessage;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.message.SimpleJMSMapMessage;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 
 /**
  * Tests the delivery/receipt of a foreign map message
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMessageTest.java
similarity index 90%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMessageTest.java
index 37c9182df2..53c3e3f659 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMessageTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message.foreign;
+package org.apache.activemq.artemis.jms.tests.message.foreign;
 
 import javax.jms.Message;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.api.jms.ActiveMQJMSConstants;
-import org.apache.activemq.jms.tests.message.MessageTestBase;
-import org.apache.activemq.jms.tests.message.SimpleJMSMessage;
-import org.apache.activemq.jms.tests.message.SimpleJMSTextMessage;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
+import org.apache.activemq.artemis.jms.tests.message.MessageTestBase;
+import org.apache.activemq.artemis.jms.tests.message.SimpleJMSMessage;
+import org.apache.activemq.artemis.jms.tests.message.SimpleJMSTextMessage;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignObjectMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignObjectMessageTest.java
similarity index 90%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignObjectMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignObjectMessageTest.java
index c88431112b..8088b592cc 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignObjectMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignObjectMessageTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message.foreign;
+package org.apache.activemq.artemis.jms.tests.message.foreign;
 import org.junit.Before;
 import org.junit.After;
 
@@ -22,8 +22,8 @@ import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.ObjectMessage;
 
-import org.apache.activemq.jms.tests.message.SimpleJMSObjectMessage;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.message.SimpleJMSObjectMessage;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 
 /**
  * Tests the delivery/receipt of a foreign object message
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignStreamMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignStreamMessageTest.java
similarity index 92%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignStreamMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignStreamMessageTest.java
index 6cd2673c89..10dd02a7d1 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignStreamMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignStreamMessageTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message.foreign;
+package org.apache.activemq.artemis.jms.tests.message.foreign;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.StreamMessage;
 
-import org.apache.activemq.jms.tests.message.SimpleJMSStreamMessage;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.message.SimpleJMSStreamMessage;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 
 /**
  * Tests the delivery/receipt of a foreign stream message
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignTestObject.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignTestObject.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignTestObject.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignTestObject.java
index d857501b32..73561e1086 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignTestObject.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignTestObject.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message.foreign;
+package org.apache.activemq.artemis.jms.tests.message.foreign;
 
 import java.io.Serializable;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignTextMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignTextMessageTest.java
similarity index 88%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignTextMessageTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignTextMessageTest.java
index bb7ff57c05..0f4797efc0 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/foreign/ForeignTextMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignTextMessageTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.message.foreign;
+package org.apache.activemq.artemis.jms.tests.message.foreign;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.jms.tests.message.SimpleJMSTextMessage;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.jms.tests.message.SimpleJMSTextMessage;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 
 /**
  * Tests the delivery/receipt of a foreign text message
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/selector/SelectorTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/selector/SelectorTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
index f5c0a4ac25..43804f9d57 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/selector/SelectorTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.selector;
+package org.apache.activemq.artemis.jms.tests.selector;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -28,10 +28,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.tests.ActiveMQServerTestCase;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.tests.ActiveMQServerTestCase;
+import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/ServerManagement.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/ServerManagement.java
similarity index 92%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/ServerManagement.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/ServerManagement.java
index 652fbc0463..1d498313cc 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/ServerManagement.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/ServerManagement.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.tools;
+package org.apache.activemq.artemis.jms.tests.tools;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
 
-import org.apache.activemq.jms.tests.JmsTestLogger;
-import org.apache.activemq.jms.tests.tools.container.InVMInitialContextFactory;
-import org.apache.activemq.jms.tests.tools.container.LocalTestServer;
-import org.apache.activemq.jms.tests.tools.container.Server;
+import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
+import org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory;
+import org.apache.activemq.artemis.jms.tests.tools.container.LocalTestServer;
+import org.apache.activemq.artemis.jms.tests.tools.container.Server;
 
 /**
  * Collection of static methods to use to start/stop and interact with the in-memory JMS server. It
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/Constants.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Constants.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/Constants.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Constants.java
index bba2655e7e..149ece1d65 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/Constants.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Constants.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.tools.container;
+package org.apache.activemq.artemis.jms.tests.tools.container;
 
 public class Constants
 {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMContext.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMContext.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
index ef01f31d85..02cd4f986c 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMContext.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.tools.container;
+package org.apache.activemq.artemis.jms.tests.tools.container;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -36,7 +36,7 @@ import javax.naming.NamingException;
 import javax.naming.RefAddr;
 import javax.naming.Reference;
 
-import org.apache.activemq.jms.tests.JmsTestLogger;
+import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
 
 public class InVMContext implements Context, Serializable
 {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMInitialContextFactory.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java
similarity index 97%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMInitialContextFactory.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java
index 5f05ab0d59..514c262583 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMInitialContextFactory.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.tools.container;
+package org.apache.activemq.artemis.jms.tests.tools.container;
 
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -51,7 +51,7 @@ public class InVMInitialContextFactory implements InitialContextFactory
    public static Hashtable getJNDIEnvironment(final int serverIndex)
    {
       Hashtable env = new Hashtable();
-      env.put("java.naming.factory.initial", "org.apache.activemq.jms.tests.tools.container.InVMInitialContextFactory");
+      env.put("java.naming.factory.initial", "org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory");
       env.put(Constants.SERVER_INDEX_PROPERTY_NAME, Integer.toString(serverIndex));
       return env;
    }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
similarity index 96%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
index 550f1652aa..34566ab20a 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.tools.container;
+package org.apache.activemq.artemis.jms.tests.tools.container;
 
-import org.apache.activemq.jms.tests.JmsTestLogger;
+import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
 
 import java.util.Hashtable;
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMNameParser.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java
similarity index 97%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMNameParser.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java
index 277c85b298..db0de4e20e 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/InVMNameParser.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.tools.container;
+package org.apache.activemq.artemis.jms.tests.tools.container;
 
 import java.io.Serializable;
 import java.util.Properties;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/LocalTestServer.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
similarity index 92%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/LocalTestServer.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
index 966e2dcf93..c19cbd104d 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/LocalTestServer.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.tools.container;
+package org.apache.activemq.artemis.jms.tests.tools.container;
 
 import java.io.File;
 import java.lang.management.ManagementFactory;
@@ -29,24 +29,24 @@ import javax.management.MBeanServerInvocationHandler;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.api.jms.management.JMSQueueControl;
-import org.apache.activemq.api.jms.management.TopicControl;
-import org.apache.activemq.core.config.FileDeploymentManager;
-import org.apache.activemq.core.config.impl.FileConfiguration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.jms.tests.JmsTestLogger;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
+import org.apache.activemq.artemis.api.jms.management.TopicControl;
+import org.apache.activemq.artemis.core.config.FileDeploymentManager;
+import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
 
 public class LocalTestServer implements Server, Runnable
 {
@@ -383,7 +383,7 @@ public class LocalTestServer implements Server, Runnable
    {
       Properties props = new Properties();
       props.setProperty("java.naming.factory.initial",
-                        "org.apache.activemq.jms.tests.tools.container.InVMInitialContextFactory");
+                        "org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory");
       props.setProperty(Constants.SERVER_INDEX_PROPERTY_NAME, "" + getServerID());
       return new InitialContext(props);
    }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/NonSerializableFactory.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/NonSerializableFactory.java
similarity index 98%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/NonSerializableFactory.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/NonSerializableFactory.java
index 940dabca8e..044981b655 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/NonSerializableFactory.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/NonSerializableFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.tools.container;
+package org.apache.activemq.artemis.jms.tests.tools.container;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/Server.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java
similarity index 95%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/Server.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java
index 1368abcf71..b92297d795 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/Server.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Server.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.tools.container;
+package org.apache.activemq.artemis.jms.tests.tools.container;
 
 import javax.naming.InitialContext;
 import java.rmi.Remote;
@@ -22,10 +22,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
 
 /**
  * The remote interface exposed by TestServer.
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/util/JNDIUtilTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java
similarity index 95%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/util/JNDIUtilTest.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java
index 52e579c063..e1568ac989 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/util/JNDIUtilTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.util;
+package org.apache.activemq.artemis.jms.tests.util;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -22,8 +22,8 @@ import org.junit.Test;
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
 
-import org.apache.activemq.jms.tests.ActiveMQServerTestCase;
-import org.apache.activemq.utils.JNDIUtil;
+import org.apache.activemq.artemis.jms.tests.ActiveMQServerTestCase;
+import org.apache.activemq.artemis.utils.JNDIUtil;
 
 public class JNDIUtilTest extends ActiveMQServerTestCase
 {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/util/ProxyAssertSupport.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/ProxyAssertSupport.java
similarity index 99%
rename from tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/util/ProxyAssertSupport.java
rename to tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/ProxyAssertSupport.java
index 75ae3a4878..1dd5fd9961 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/util/ProxyAssertSupport.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/ProxyAssertSupport.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.tests.util;
+package org.apache.activemq.artemis.jms.tests.util;
 
-import org.apache.activemq.jms.tests.JmsTestLogger;
+import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
 import org.junit.Assert;
 
 /**
diff --git a/tests/jms-tests/src/test/resources/jndi.properties b/tests/jms-tests/src/test/resources/jndi.properties
index ee3ad0e40b..52151446e6 100644
--- a/tests/jms-tests/src/test/resources/jndi.properties
+++ b/tests/jms-tests/src/test/resources/jndi.properties
@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=vm://0
\ No newline at end of file
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index b7be2bb06a..04c4ca7316 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -19,8 +19,8 @@
    4.0.0
    
       org.apache.activemq.tests
-      activemq-tests-pom
-      10.0.0-SNAPSHOT
+      artemis-tests-pom
+      1.0.0-SNAPSHOT
    
 
    joram-tests
@@ -41,12 +41,12 @@
       
       
          org.apache.activemq
-         activemq-ra
+         artemis-ra
          ${project.version}
       
       
          org.apache.activemq
-         activemq-bootstrap
+         artemis-bootstrap
          ${project.version}
       
       
@@ -82,7 +82,7 @@
       
       
          org.apache.activemq
-         activemq-commons
+         artemis-commons
          ${project.version}
          test
       
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/jms/AbstractAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/AbstractAdmin.java
similarity index 98%
rename from tests/joram-tests/src/test/java/org/apache/activemq/jms/AbstractAdmin.java
rename to tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/AbstractAdmin.java
index ba4e69a865..bcfdcbb15d 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/jms/AbstractAdmin.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/AbstractAdmin.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms;
+package org.apache.activemq.artemis.jms;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/ActiveMQAdmin.java
similarity index 90%
rename from tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQAdmin.java
rename to tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/ActiveMQAdmin.java
index 0c9dbd5b14..c99cc558e1 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQAdmin.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/ActiveMQAdmin.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms;
+package org.apache.activemq.artemis.jms;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -24,18 +24,18 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.util.Hashtable;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientRequestor;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.core.management.ManagementHelper;
-import org.apache.activemq.api.core.management.ResourceNames;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.tests.util.SpawnedVMSupport;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientRequestor;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.ManagementHelper;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.tests.util.SpawnedVMSupport;
 import org.junit.Assert;
 import org.objectweb.jtests.jms.admin.Admin;
 
@@ -61,7 +61,7 @@ public class ActiveMQAdmin implements Admin
     * @see https://github.com/activemq/activemq-version-tests
     */
    private final boolean serverLifeCycleActive;
-   private static final String SERVER_LIVE_CYCLE_PROPERTY = "org.apache.activemq.jms.ActiveMQAdmin.serverLifeCycle";
+   private static final String SERVER_LIVE_CYCLE_PROPERTY = "org.apache.activemq.artemis.jms.ActiveMQAdmin.serverLifeCycle";
 
    public ActiveMQAdmin()
    {
@@ -69,7 +69,7 @@ public class ActiveMQAdmin implements Admin
       try
       {
          Hashtable env = new Hashtable();
-         env.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+         env.put("java.naming.factory.initial", "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
          env.put("java.naming.provider.url", "tcp://localhost:61616");
          context = new InitialContext(env);
       }
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/jms/GenericAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/GenericAdmin.java
similarity index 98%
rename from tests/joram-tests/src/test/java/org/apache/activemq/jms/GenericAdmin.java
rename to tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/GenericAdmin.java
index 385dc12ebc..2c64a00ce1 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/jms/GenericAdmin.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/GenericAdmin.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms;
+package org.apache.activemq.artemis.jms;
 
 import javax.naming.Context;
 import javax.naming.NamingException;
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/jms/JoramAggregationTest.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/JoramAggregationTest.java
similarity index 98%
rename from tests/joram-tests/src/test/java/org/apache/activemq/jms/JoramAggregationTest.java
rename to tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/JoramAggregationTest.java
index 6fec0a95ef..d7f62d0e75 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/jms/JoramAggregationTest.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/JoramAggregationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms;
+package org.apache.activemq.artemis.jms;
 import java.io.IOException;
 import java.util.Properties;
 
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/jms/SpawnedJMSServer.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/SpawnedJMSServer.java
similarity index 83%
rename from tests/joram-tests/src/test/java/org/apache/activemq/jms/SpawnedJMSServer.java
rename to tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/SpawnedJMSServer.java
index 152588518e..4419256b2f 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/jms/SpawnedJMSServer.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/SpawnedJMSServer.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms;
+package org.apache.activemq.artemis.jms;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
 
 public class SpawnedJMSServer
 {
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java
index e2f02f3084..e6b7d5e404 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java
@@ -28,6 +28,7 @@ import javax.naming.NamingException;
 
 import java.util.Hashtable;
 
+import org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory;
 import org.junit.Assert;
 import org.junit.Test;
 import org.objectweb.jtests.jms.framework.PTPTestCase;
@@ -206,7 +207,7 @@ public class MessageHeaderTest extends PTPTestCase
          admin.createQueue("anotherQueue");
 
          Hashtable props = new Hashtable<>();
-         props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+         props.put(Context.INITIAL_CONTEXT_FACTORY, ActiveMQInitialContextFactory.class.getName());
          props.put("queue.anotherQueue", "anotherQueue");
 
          Context ctx = new InitialContext(props);
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PTPTestCase.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PTPTestCase.java
index 44442ffddd..3da05282f1 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PTPTestCase.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PTPTestCase.java
@@ -27,7 +27,7 @@ import javax.naming.InitialContext;
 
 import java.util.Hashtable;
 
-import org.apache.activemq.jndi.ActiveMQInitialContextFactory;
+import org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PubSubTestCase.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PubSubTestCase.java
index acdaf32b2a..43bae2e288 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PubSubTestCase.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PubSubTestCase.java
@@ -27,7 +27,7 @@ import javax.naming.InitialContext;
 
 import java.util.Hashtable;
 
-import org.apache.activemq.jndi.ActiveMQInitialContextFactory;
+import org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/UnifiedTestCase.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/UnifiedTestCase.java
index 250aed0eb4..9c09a4a7b5 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/UnifiedTestCase.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/UnifiedTestCase.java
@@ -30,7 +30,7 @@ import javax.naming.InitialContext;
 
 import java.util.Hashtable;
 
-import org.apache.activemq.jndi.ActiveMQInitialContextFactory;
+import org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/tests/joram-tests/src/test/resources/provider.properties b/tests/joram-tests/src/test/resources/provider.properties
index bcce1cf6b5..111c87a655 100644
--- a/tests/joram-tests/src/test/resources/provider.properties
+++ b/tests/joram-tests/src/test/resources/provider.properties
@@ -19,7 +19,7 @@
 # Uncomment the chosen provider and comment the other ones
 ##
 
-jms.provider.admin.class=org.apache.activemq.jms.ActiveMQAdmin
+jms.provider.admin.class=org.apache.activemq.artemis.jms.ActiveMQAdmin
 #jms.provider.admin.class = org.apache.activemq.api.jms.GenericAdmin
 #jms.provider.admin.class = org.objectweb.jtests.providers.admin.JoramAdmin
 #jms.provider.admin.class = org.objectweb.jtests.providers.admin.AshnaMQAdmin
diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml
index 87a665ace1..fa2db0b2ec 100644
--- a/tests/performance-tests/pom.xml
+++ b/tests/performance-tests/pom.xml
@@ -19,8 +19,8 @@
    4.0.0
    
       org.apache.activemq.tests
-      activemq-tests-pom
-      10.0.0-SNAPSHOT
+      artemis-tests-pom
+      1.0.0-SNAPSHOT
    
 
    performance-tests
@@ -34,14 +34,14 @@
    
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
          test
          test-jar
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
          test
          test-jar
@@ -62,17 +62,17 @@
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-ra
+         artemis-ra
          ${project.version}
       
       
          org.apache.activemq
-         activemq-bootstrap
+         artemis-bootstrap
          ${project.version}
       
       
@@ -104,7 +104,7 @@
       
       
          org.apache.activemq
-         activemq-commons
+         artemis-commons
          ${project.version}
          test
       
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/FakeJournalImplTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/FakeJournalImplTest.java
similarity index 81%
rename from tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/FakeJournalImplTest.java
rename to tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/FakeJournalImplTest.java
index dfe9452827..0cf0d62038 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/FakeJournalImplTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/FakeJournalImplTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.performance.journal;
+package org.apache.activemq.artemis.tests.performance.journal;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
 
 /**
  *
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/JournalImplTestUnit.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java
similarity index 91%
rename from tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/JournalImplTestUnit.java
rename to tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java
index f12ba57ef0..2213139645 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/JournalImplTestUnit.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.performance.journal;
+package org.apache.activemq.artemis.tests.performance.journal;
 import org.junit.After;
 
 import org.junit.Test;
@@ -23,14 +23,14 @@ import java.util.ArrayList;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.journal.Journal;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.SimpleEncoding;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.journal.Journal;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
 
 public abstract class JournalImplTestUnit extends JournalImplTestBase
 {
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/RealJournalImplAIOTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplAIOTest.java
similarity index 85%
rename from tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/RealJournalImplAIOTest.java
rename to tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplAIOTest.java
index f887df55c4..a162ef68df 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/RealJournalImplAIOTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplAIOTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.performance.journal;
+package org.apache.activemq.artemis.tests.performance.journal;
 import java.io.File;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/RealJournalImplNIOTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplNIOTest.java
similarity index 82%
rename from tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/RealJournalImplNIOTest.java
rename to tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplNIOTest.java
index b72e890b32..9ee630fc56 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/journal/RealJournalImplNIOTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/RealJournalImplNIOTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.performance.journal;
+package org.apache.activemq.artemis.tests.performance.journal;
 
 import java.io.File;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
 
 public class RealJournalImplNIOTest extends JournalImplTestUnit
 {
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/paging/MeasurePagingMultiThreadTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/paging/MeasurePagingMultiThreadTest.java
similarity index 87%
rename from tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/paging/MeasurePagingMultiThreadTest.java
rename to tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/paging/MeasurePagingMultiThreadTest.java
index 183eedc0f9..c5b847bda3 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/paging/MeasurePagingMultiThreadTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/paging/MeasurePagingMultiThreadTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.performance.paging;
+package org.apache.activemq.artemis.tests.performance.paging;
 import java.util.HashMap;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 public class MeasurePagingMultiThreadTest extends ServiceTestBase
@@ -176,7 +176,7 @@ public class MeasurePagingMultiThreadTest extends ServiceTestBase
     * @param nMessages
     * @param messageSize
     * @param factory
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    private void sendInitialBatch(final SimpleString adr,
                                  final int nMessages,
@@ -196,7 +196,7 @@ public class MeasurePagingMultiThreadTest extends ServiceTestBase
     * @param nMessages
     * @param producer
     * @param msg
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    private void sendMessages(final int nMessages, final ClientProducer producer, final ClientMessage msg) throws ActiveMQException
    {
@@ -209,7 +209,7 @@ public class MeasurePagingMultiThreadTest extends ServiceTestBase
    /**
     * @param factory
     * @param adr
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    private void createDestination(final ClientSessionFactory factory, final SimpleString adr) throws ActiveMQException
    {
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/AbstractSendReceivePerfTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/AbstractSendReceivePerfTest.java
similarity index 93%
rename from tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/AbstractSendReceivePerfTest.java
rename to tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/AbstractSendReceivePerfTest.java
index 6df2373ffd..d77f7bf269 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/AbstractSendReceivePerfTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/AbstractSendReceivePerfTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.performance.sends;
+package org.apache.activemq.artemis.tests.performance.sends;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -30,11 +30,11 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/ClientACKPerf.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/ClientACKPerf.java
similarity index 98%
rename from tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/ClientACKPerf.java
rename to tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/ClientACKPerf.java
index 1d673a4ce7..6f1d877164 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/ClientACKPerf.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/ClientACKPerf.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.performance.sends;
+package org.apache.activemq.artemis.tests.performance.sends;
 
 import javax.jms.Connection;
 import javax.jms.Message;
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/MeasureCommitPerfTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/MeasureCommitPerfTest.java
similarity index 97%
rename from tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/MeasureCommitPerfTest.java
rename to tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/MeasureCommitPerfTest.java
index c7f415a7bf..f9e81b381e 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/MeasureCommitPerfTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/MeasureCommitPerfTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.performance.sends;
+package org.apache.activemq.artemis.tests.performance.sends;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/PreACKPerf.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/PreACKPerf.java
similarity index 95%
rename from tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/PreACKPerf.java
rename to tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/PreACKPerf.java
index 21b2fdedd2..883b57b2ee 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/sends/PreACKPerf.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/sends/PreACKPerf.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.performance.sends;
+package org.apache.activemq.artemis.tests.performance.sends;
 
 import javax.jms.Connection;
 import javax.jms.Message;
@@ -22,7 +22,7 @@ import javax.jms.MessageConsumer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
-import org.apache.activemq.api.jms.ActiveMQJMSConstants;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
 
 public class PreACKPerf extends AbstractSendReceivePerfTest
 {
diff --git a/tests/pom.xml b/tests/pom.xml
index 071128a282..6f8c0617b3 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -17,14 +17,14 @@
 
    
       org.apache.activemq
-      activemq-pom
-      10.0.0-SNAPSHOT
+      artemis-pom
+      1.0.0-SNAPSHOT
    
 
    ActiveMQ Artemis Tests POM
    4.0.0
    org.apache.activemq.tests
-   activemq-tests-pom
+   artemis-tests-pom
    pom
 
    
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index e14ad2e7cb..da88aec456 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -19,8 +19,8 @@
    4.0.0
    
       org.apache.activemq.tests
-      activemq-tests-pom
-      10.0.0-SNAPSHOT
+      artemis-tests-pom
+      1.0.0-SNAPSHOT
    
 
    soak-tests
@@ -34,14 +34,14 @@
    
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
          test
          test-jar
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
          test
          test-jar
@@ -62,17 +62,17 @@
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-ra
+         artemis-ra
          ${project.version}
       
       
          org.apache.activemq
-         activemq-bootstrap
+         artemis-bootstrap
          ${project.version}
       
       
@@ -108,7 +108,7 @@
       
       
          org.apache.activemq
-         activemq-commons
+         artemis-commons
          ${project.version}
          test
       
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientAbstract.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
similarity index 93%
rename from tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientAbstract.java
rename to tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
index aecf4d6e22..78cf1538c4 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientAbstract.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.soak.client;
+package org.apache.activemq.artemis.tests.soak.client;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.core.transaction.impl.XidImpl;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 /**
  * WARNING: This is not a sample on how you should handle XA. You are supposed to use a
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientNonDivertedSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientNonDivertedSoakTest.java
similarity index 85%
rename from tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientNonDivertedSoakTest.java
rename to tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientNonDivertedSoakTest.java
index 0ad3231c7d..5fde67a106 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientNonDivertedSoakTest.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientNonDivertedSoakTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.soak.client;
+package org.apache.activemq.artemis.tests.soak.client;
 
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientSoakTest.java
similarity index 88%
rename from tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientSoakTest.java
rename to tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientSoakTest.java
index 31d926283c..920ef55c6a 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/ClientSoakTest.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientSoakTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.soak.client;
+package org.apache.activemq.artemis.tests.soak.client;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.DivertConfiguration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.DivertConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/Receiver.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Receiver.java
similarity index 88%
rename from tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/Receiver.java
rename to tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Receiver.java
index c39114e1f2..60d212e2c2 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/Receiver.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Receiver.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.soak.client;
+package org.apache.activemq.artemis.tests.soak.client;
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.utils.ReusableLatch;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.utils.ReusableLatch;
 
 public class Receiver extends ClientAbstract
 {
@@ -111,7 +111,7 @@ public class Receiver extends ClientAbstract
    }
 
    /* (non-Javadoc)
-    * @see org.apache.activemq.jms.example.ClientAbstract#connectClients()
+    * @see org.apache.activemq.artemis.jms.example.ClientAbstract#connectClients()
     */
    @Override
    protected void connectClients() throws Exception
@@ -123,7 +123,7 @@ public class Receiver extends ClientAbstract
    }
 
    /* (non-Javadoc)
-    * @see org.apache.activemq.jms.example.ClientAbstract#onCommit()
+    * @see org.apache.activemq.artemis.jms.example.ClientAbstract#onCommit()
     */
    @Override
    protected void onCommit()
@@ -135,7 +135,7 @@ public class Receiver extends ClientAbstract
    }
 
    /* (non-Javadoc)
-    * @see org.apache.activemq.jms.example.ClientAbstract#onRollback()
+    * @see org.apache.activemq.artemis.jms.example.ClientAbstract#onRollback()
     */
    @Override
    protected void onRollback()
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/Sender.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Sender.java
similarity index 87%
rename from tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/Sender.java
rename to tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Sender.java
index 7f273f5e1e..6190b0e2d8 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/Sender.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Sender.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.soak.client;
+package org.apache.activemq.artemis.tests.soak.client;
 
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
 
 public class Sender extends ClientAbstract
 {
@@ -82,7 +82,7 @@ public class Sender extends ClientAbstract
    }
 
    /* (non-Javadoc)
-    * @see org.apache.activemq.jms.example.ClientAbstract#onCommit()
+    * @see org.apache.activemq.artemis.jms.example.ClientAbstract#onCommit()
     */
    @Override
    protected void onCommit()
@@ -97,7 +97,7 @@ public class Sender extends ClientAbstract
    }
 
    /* (non-Javadoc)
-    * @see org.apache.activemq.jms.example.ClientAbstract#onRollback()
+    * @see org.apache.activemq.artemis.jms.example.ClientAbstract#onRollback()
     */
    @Override
    protected void onRollback()
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/SimpleSendReceiveSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/SimpleSendReceiveSoakTest.java
similarity index 83%
rename from tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/SimpleSendReceiveSoakTest.java
rename to tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/SimpleSendReceiveSoakTest.java
index 61adcf365d..b6715500da 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/client/SimpleSendReceiveSoakTest.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/SimpleSendReceiveSoakTest.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.soak.client;
+package org.apache.activemq.artemis.tests.soak.client;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import java.util.HashMap;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class SimpleSendReceiveSoakTest extends ServiceTestBase
 {
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/failover/RandomFailoverSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/failover/RandomFailoverSoakTest.java
similarity index 86%
rename from tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/failover/RandomFailoverSoakTest.java
rename to tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/failover/RandomFailoverSoakTest.java
index c4f440f51f..e527f19158 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/tests/soak/failover/RandomFailoverSoakTest.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/failover/RandomFailoverSoakTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.soak.failover;
+package org.apache.activemq.artemis.tests.soak.failover;
 
-import org.apache.activemq.tests.integration.cluster.reattach.RandomReattachTest;
+import org.apache.activemq.artemis.tests.integration.cluster.reattach.RandomReattachTest;
 
 public class RandomFailoverSoakTest extends RandomReattachTest
 {
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index 776e0e9e86..d48d11278b 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -19,8 +19,8 @@
    4.0.0
    
       org.apache.activemq.tests
-      activemq-tests-pom
-      10.0.0-SNAPSHOT
+      artemis-tests-pom
+      1.0.0-SNAPSHOT
    
 
    stress-tests
@@ -34,14 +34,14 @@
    
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
          test
          test-jar
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
          test
          test-jar
@@ -69,17 +69,17 @@
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-ra
+         artemis-ra
          ${project.version}
       
       
          org.apache.activemq
-         activemq-bootstrap
+         artemis-bootstrap
          ${project.version}
       
       
@@ -115,7 +115,7 @@
       
       
          org.apache.activemq
-         activemq-commons
+         artemis-commons
          ${project.version}
          test
       
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/chunk/LargeMessageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/chunk/LargeMessageStressTest.java
similarity index 93%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/chunk/LargeMessageStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/chunk/LargeMessageStressTest.java
index 278ba204a7..fb4224ee4c 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/chunk/LargeMessageStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/chunk/LargeMessageStressTest.java
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.chunk;
+package org.apache.activemq.artemis.tests.stress.chunk;
 
+import org.apache.activemq.artemis.tests.integration.largemessage.LargeMessageTestBase;
 import org.junit.Test;
 
-import org.apache.activemq.tests.integration.largemessage.LargeMessageTestBase;
-
 public class LargeMessageStressTest extends LargeMessageTestBase
 {
 
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/client/SendStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/client/SendStressTest.java
similarity index 86%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/client/SendStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/client/SendStressTest.java
index bf43dbd73c..7c6ed13cf1 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/client/SendStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/client/SendStressTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.client;
+package org.apache.activemq.artemis.tests.stress.client;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/failover/MultiThreadRandomReattachStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/failover/MultiThreadRandomReattachStressTest.java
similarity index 85%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/failover/MultiThreadRandomReattachStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/failover/MultiThreadRandomReattachStressTest.java
index 81540808fd..dd7e205c58 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/failover/MultiThreadRandomReattachStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/failover/MultiThreadRandomReattachStressTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.failover;
+package org.apache.activemq.artemis.tests.stress.failover;
 
-import org.apache.activemq.tests.integration.cluster.reattach.MultiThreadRandomReattachTest;
+import org.apache.activemq.artemis.tests.integration.cluster.reattach.MultiThreadRandomReattachTest;
 
 public class MultiThreadRandomReattachStressTest extends MultiThreadRandomReattachTest
 {
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/failover/RandomReattachStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/failover/RandomReattachStressTest.java
similarity index 91%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/failover/RandomReattachStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/failover/RandomReattachStressTest.java
index 29950d181d..8f298a14de 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/failover/RandomReattachStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/failover/RandomReattachStressTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.failover;
+package org.apache.activemq.artemis.tests.stress.failover;
 
-import org.apache.activemq.tests.integration.cluster.reattach.RandomReattachTest;
+import org.apache.activemq.artemis.tests.integration.cluster.reattach.RandomReattachTest;
 
 public class RandomReattachStressTest extends RandomReattachTest
 {
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java
similarity index 88%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java
index 1ea8e604c8..437a57146f 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
 import java.io.File;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.core.journal.impl.JournalConstants;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.JournalConstants;
 
 public class AIOAllPossibilitiesCompactStressTest extends AllPossibilitiesCompactStressTest
 {
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AIOMultiThreadCompactorStressTest.java
similarity index 86%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AIOMultiThreadCompactorStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AIOMultiThreadCompactorStressTest.java
index 8dc1ba7126..3d5303893d 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AIOMultiThreadCompactorStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AIOMultiThreadCompactorStressTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.core.server.JournalType;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.server.JournalType;
 import org.junit.BeforeClass;
 
 public class AIOMultiThreadCompactorStressTest extends NIOMultiThreadCompactorStressTest
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AddAndRemoveStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AddAndRemoveStressTest.java
similarity index 92%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AddAndRemoveStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AddAndRemoveStressTest.java
index 04d93f4d31..4c96ad69f6 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AddAndRemoveStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AddAndRemoveStressTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.core.journal.LoaderCallback;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.SimpleEncoding;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.LoaderCallback;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AllPossibilitiesCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AllPossibilitiesCompactStressTest.java
similarity index 97%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AllPossibilitiesCompactStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AllPossibilitiesCompactStressTest.java
index f391c05ca3..9c0a532e24 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AllPossibilitiesCompactStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AllPossibilitiesCompactStressTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
 
 public class AllPossibilitiesCompactStressTest extends MixupCompactorTestBase
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java
similarity index 96%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java
index 003f8df2da..b52d614b87 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
 public class AllPossibilitiesCompactWithAddDeleteStressTest extends MixupCompactorTestBase
 {
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/CompactingStressTest.java
similarity index 91%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/CompactingStressTest.java
index 8421f2e457..c72e8ec702 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/CompactingStressTest.java
@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.util.concurrent.CountDownLatch;
@@ -24,19 +26,17 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.JournalType;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.JournalType;
 
 public class CompactingStressTest extends ServiceTestBase
 {
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java
similarity index 93%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java
index 2cd47db23b..54bfc7393b 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -32,23 +32,23 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.journal.IOAsyncTask;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.TransactionFailureCallback;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.ActiveMQThreadFactory;
-import org.apache.activemq.utils.OrderedExecutorFactory;
-import org.apache.activemq.utils.SimpleIDGenerator;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.journal.IOAsyncTask;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.TransactionFailureCallback;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
+import org.apache.activemq.artemis.utils.OrderedExecutorFactory;
+import org.apache.activemq.artemis.utils.SimpleIDGenerator;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalRestartStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalRestartStressTest.java
similarity index 89%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalRestartStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalRestartStressTest.java
index 86e851d61d..8a381e4a55 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalRestartStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalRestartStressTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
 import java.util.ArrayList;
 import java.util.Random;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Test;
 
 /**
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/LargeJournalStressTest.java
similarity index 90%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/LargeJournalStressTest.java
index bec2501e10..9431f0b6b3 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/LargeJournalStressTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.JournalType;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.JournalType;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MixupCompactorTestBase.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MixupCompactorTestBase.java
similarity index 92%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MixupCompactorTestBase.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MixupCompactorTestBase.java
index 6f741b30c7..204f3b6c78 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MixupCompactorTestBase.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MixupCompactorTestBase.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
 import java.io.File;
 import java.io.FilenameFilter;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase;
-import org.apache.activemq.utils.ReusableLatch;
-import org.apache.activemq.utils.SimpleIDGenerator;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.utils.ReusableLatch;
+import org.apache.activemq.artemis.utils.SimpleIDGenerator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MultiThreadConsumerStressTest.java
similarity index 91%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MultiThreadConsumerStressTest.java
index c97c8647ac..97a6a0eb13 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MultiThreadConsumerStressTest.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.JournalType;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.JournalType;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
similarity index 91%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
index c35f0d996a..c5913d2f44 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
@@ -22,25 +22,25 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.JournalType;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.JournalType;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -145,7 +145,7 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase
 
    /**
     * @param xid
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    private void addEmptyTransaction(final Xid xid) throws Exception
    {
@@ -263,7 +263,7 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase
    /**
     * @param numberOfMessagesExpected
     * @param queue
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    private void drainQueue(final int numberOfMessagesExpected, final SimpleString queue) throws ActiveMQException
    {
@@ -291,7 +291,7 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase
    }
 
    /**
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    private void addBogusData(final int nmessages, final String queue) throws ActiveMQException
    {
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/XmlImportExportStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java
similarity index 85%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/XmlImportExportStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java
index 966b848470..ff344edfe1 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/XmlImportExportStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.journal;
+package org.apache.activemq.artemis.tests.stress.journal;
 
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Test;
 
-import org.apache.activemq.tools.XmlDataExporter;
-import org.apache.activemq.tools.XmlDataImporter;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tools.XmlDataExporter;
+import org.apache.activemq.artemis.tools.XmlDataImporter;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/MultipleConsumersPageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java
similarity index 93%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/MultipleConsumersPageStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java
index ad1e083f22..57d29490e6 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/MultipleConsumersPageStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.paging;
+package org.apache.activemq.artemis.tests.stress.paging;
 import org.junit.Before;
 import org.junit.After;
 
@@ -27,19 +27,19 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class MultipleConsumersPageStressTest extends ServiceTestBase
 {
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageCursorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java
similarity index 94%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageCursorStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java
index e4e70e3fa3..e1d478a45e 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageCursorStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.paging;
+package org.apache.activemq.artemis.tests.stress.paging;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,31 +24,31 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.paging.cursor.PageCache;
-import org.apache.activemq.core.paging.cursor.PageCursorProvider;
-import org.apache.activemq.core.paging.cursor.PageSubscription;
-import org.apache.activemq.core.paging.cursor.PagedReference;
-import org.apache.activemq.core.paging.cursor.impl.PageCursorProviderImpl;
-import org.apache.activemq.core.paging.impl.PagingStoreImpl;
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.RoutingContext;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.RoutingContextImpl;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.core.transaction.Transaction;
-import org.apache.activemq.core.transaction.impl.TransactionImpl;
-import org.apache.activemq.tests.unit.core.postoffice.impl.FakeQueue;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.LinkedListIterator;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.tests.unit.core.postoffice.impl.FakeQueue;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.paging.cursor.PageCache;
+import org.apache.activemq.artemis.core.paging.cursor.PageCursorProvider;
+import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
+import org.apache.activemq.artemis.core.paging.cursor.PagedReference;
+import org.apache.activemq.artemis.core.paging.cursor.impl.PageCursorProviderImpl;
+import org.apache.activemq.artemis.core.paging.impl.PagingStoreImpl;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.RoutingContext;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.RoutingContextImpl;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.transaction.Transaction;
+import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.LinkedListIterator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java
similarity index 89%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java
index fc0338bec7..d954d65271 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/paging/PageStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.paging;
+package org.apache.activemq.artemis.tests.stress.paging;
 
 import java.util.HashMap;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.client.ActiveMQBytesMessage;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.client.ActiveMQBytesMessage;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/remote/PingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/remote/PingStressTest.java
similarity index 84%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/remote/PingStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/remote/PingStressTest.java
index 4424ee9662..4596e8dc0c 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/remote/PingStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/remote/PingStressTest.java
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.remote;
-import org.apache.activemq.api.core.ActiveMQException;
+package org.apache.activemq.artemis.tests.stress.remote;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -23,20 +23,20 @@ import org.junit.Test;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 
 public class PingStressTest extends ServiceTestBase
 {
@@ -81,7 +81,7 @@ public class PingStressTest extends ServiceTestBase
     */
    private void internalTest() throws Exception
    {
-      final TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory");
+      final TransportConfiguration transportConfig = new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory");
 
       Interceptor noPongInterceptor = new Interceptor()
       {
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/stomp/StompStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/stomp/StompStressTest.java
similarity index 86%
rename from tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/stomp/StompStressTest.java
rename to tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/stomp/StompStressTest.java
index 64051e7e2c..e06dcce757 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/stomp/StompStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/stomp/StompStressTest.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.stress.stomp;
+package org.apache.activemq.artemis.tests.stress.stomp;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -31,17 +32,16 @@ import java.util.Map;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.CoreQueueConfiguration;
-import org.apache.activemq.core.protocol.stomp.Stomp;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
+import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
 
 public class StompStressTest extends UnitTestCase
 {
diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml
index 5d76d8ca86..df7d514408 100644
--- a/tests/timing-tests/pom.xml
+++ b/tests/timing-tests/pom.xml
@@ -19,8 +19,8 @@
    4.0.0
    
       org.apache.activemq.tests
-      activemq-tests-pom
-      10.0.0-SNAPSHOT
+      artemis-tests-pom
+      1.0.0-SNAPSHOT
    
 
    timing-tests
@@ -34,14 +34,14 @@
    
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
          test
          test-jar
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
          test
          test-jar
@@ -55,13 +55,13 @@
       
       
          org.apache.activemq
-         activemq-jms-client
+         artemis-jms-client
          ${project.version}
          test
       
       
          org.apache.activemq
-         activemq-bootstrap
+         artemis-bootstrap
          ${project.version}
       
       
@@ -93,7 +93,7 @@
       
       
          org.apache.activemq
-         activemq-commons
+         artemis-commons
          ${project.version}
          test
       
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/AIOJournalImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/AIOJournalImplTest.java
similarity index 80%
rename from tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/AIOJournalImplTest.java
rename to tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/AIOJournalImplTest.java
index a3a06192b1..7182ebc25b 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/AIOJournalImplTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/AIOJournalImplTest.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.timing.core.journal.impl;
+package org.apache.activemq.artemis.tests.timing.core.journal.impl;
 import java.io.File;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
 import org.junit.BeforeClass;
 
 public class AIOJournalImplTest extends JournalImplTestUnit
@@ -34,7 +35,7 @@ public class AIOJournalImplTest extends JournalImplTestUnit
    {
       File file = new File(getTestDir());
 
-      deleteDirectory(file);
+      UnitTestCase.deleteDirectory(file);
 
       file.mkdir();
 
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/FakeJournalImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/FakeJournalImplTest.java
similarity index 80%
rename from tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/FakeJournalImplTest.java
rename to tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/FakeJournalImplTest.java
index 31d64ebbc2..ce8f4a7898 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/FakeJournalImplTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/FakeJournalImplTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.timing.core.journal.impl;
+package org.apache.activemq.artemis.tests.timing.core.journal.impl;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
 
 public class FakeJournalImplTest extends JournalImplTestUnit
 {
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/JournalImplTestUnit.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/JournalImplTestUnit.java
similarity index 90%
rename from tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/JournalImplTestUnit.java
rename to tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/JournalImplTestUnit.java
index c173338a3d..8785cf1c8c 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/JournalImplTestUnit.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/JournalImplTestUnit.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.timing.core.journal.impl;
+package org.apache.activemq.artemis.tests.timing.core.journal.impl;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase;
 import org.junit.After;
 
 import org.junit.Test;
@@ -23,11 +24,10 @@ import java.util.ArrayList;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
 
 public abstract class JournalImplTestUnit extends JournalImplTestBase
 {
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/NIOJournalImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/NIOJournalImplTest.java
similarity index 78%
rename from tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/NIOJournalImplTest.java
rename to tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/NIOJournalImplTest.java
index e276ed0e40..71477d1947 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/journal/impl/NIOJournalImplTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/NIOJournalImplTest.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.timing.core.journal.impl;
+package org.apache.activemq.artemis.tests.timing.core.journal.impl;
 
 import java.io.File;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
 
 public class NIOJournalImplTest extends JournalImplTestUnit
 {
@@ -35,7 +36,7 @@ public class NIOJournalImplTest extends JournalImplTestUnit
 
       NIOJournalImplTest.log.debug("deleting directory " + journalDir);
 
-      deleteDirectory(file);
+      UnitTestCase.deleteDirectory(file);
 
       file.mkdir();
 
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/server/impl/QueueConcurrentTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java
similarity index 87%
rename from tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/server/impl/QueueConcurrentTest.java
rename to tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java
index a2be18f36e..8f71002319 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/server/impl/QueueConcurrentTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java
@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.timing.core.server.impl;
+package org.apache.activemq.artemis.tests.timing.core.server.impl;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeQueueFactory;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -23,16 +25,14 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.server.HandleStatus;
-import org.apache.activemq.core.server.MessageReference;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakeConsumer;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakeQueueFactory;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.HandleStatus;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeConsumer;
 
 /**
  *
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/server/impl/QueueImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueImplTest.java
similarity index 94%
rename from tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/server/impl/QueueImplTest.java
rename to tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueImplTest.java
index 0f431c3a8a..30fb6c493b 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/core/server/impl/QueueImplTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueImplTest.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.timing.core.server.impl;
+package org.apache.activemq.artemis.tests.timing.core.server.impl;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -30,13 +31,12 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.server.Consumer;
-import org.apache.activemq.core.server.HandleStatus;
-import org.apache.activemq.core.server.MessageReference;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakeConsumer;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.Consumer;
+import org.apache.activemq.artemis.core.server.HandleStatus;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeConsumer;
 
 public class QueueImplTest extends UnitTestCase
 {
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
similarity index 94%
rename from tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
rename to tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
index 314f3661ef..b4905a5d17 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.timing.jms.bridge.impl;
+package org.apache.activemq.artemis.tests.timing.jms.bridge.impl;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -43,27 +43,27 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.api.jms.management.JMSQueueControl;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.bridge.ConnectionFactoryFactory;
-import org.apache.activemq.jms.bridge.DestinationFactory;
-import org.apache.activemq.jms.bridge.QualityOfServiceMode;
-import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory;
+import org.apache.activemq.artemis.jms.bridge.DestinationFactory;
+import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode;
+import org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/ReusableLatchTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/ReusableLatchTest.java
similarity index 88%
rename from tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/ReusableLatchTest.java
rename to tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/ReusableLatchTest.java
index fe597518c3..2189b4ec2c 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/ReusableLatchTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/ReusableLatchTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.timing.util;
+package org.apache.activemq.artemis.tests.timing.util;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.ReusableLatch;
+import org.apache.activemq.artemis.utils.ReusableLatch;
 
 public class ReusableLatchTest extends UnitTestCase
 {
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/TokenBucketLimiterImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/TokenBucketLimiterImplTest.java
similarity index 96%
rename from tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/TokenBucketLimiterImplTest.java
rename to tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/TokenBucketLimiterImplTest.java
index 990498f059..6e0af14585 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/TokenBucketLimiterImplTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/TokenBucketLimiterImplTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.timing.util;
+package org.apache.activemq.artemis.tests.timing.util;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.TokenBucketLimiterImpl;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UTF8Test.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UTF8Test.java
similarity index 92%
rename from tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UTF8Test.java
rename to tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UTF8Test.java
index e7a30359d4..ab37d4aded 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UTF8Test.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UTF8Test.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.timing.util;
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
+package org.apache.activemq.artemis.tests.timing.util;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
 import org.junit.After;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UTF8Util;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.UTF8Util;
 
 public class UTF8Test extends UnitTestCase
 {
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UUIDTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UUIDTest.java
similarity index 89%
rename from tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UUIDTest.java
rename to tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UUIDTest.java
index 23f3a86a9d..22ea9db2ca 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/util/UUIDTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UUIDTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.timing.util;
+package org.apache.activemq.artemis.tests.timing.util;
 
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
-public class UUIDTest extends org.apache.activemq.tests.unit.util.UUIDTest
+public class UUIDTest extends org.apache.activemq.artemis.tests.unit.util.UUIDTest
 {
 
    // Constants -----------------------------------------------------
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 55e0882cba..708ace5276 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -18,8 +18,8 @@
    4.0.0
    
       org.apache.activemq.tests
-      activemq-tests-pom
-      10.0.0-SNAPSHOT
+      artemis-tests-pom
+      1.0.0-SNAPSHOT
    
 
    unit-tests
@@ -33,41 +33,41 @@
    
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
          test
          test-jar
       
       
          org.apache.activemq
-         activemq-server
+         artemis-server
          ${project.version}
          test
          test-jar
       
       
          org.apache.activemq
-         activemq-jms-server
+         artemis-jms-server
          ${project.version}
       
       
          org.apache.activemq
-         activemq-core-client
+         artemis-core-client
          ${project.version}
       
       
          org.apache.activemq
-         activemq-ra
+         artemis-ra
          ${project.version}
       
       
          org.apache.activemq
-         activemq-bootstrap
+         artemis-bootstrap
          ${project.version}
       
       
          org.apache.activemq
-         activemq-tools
+         artemis-tools
          ${project.version}
       
       
@@ -99,7 +99,7 @@
       
       
          org.apache.activemq
-         activemq-commons
+         artemis-commons
          ${project.version}
          test
       
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/UnitTestLogger.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/UnitTestLogger.java
similarity index 96%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/UnitTestLogger.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/UnitTestLogger.java
index 8ae5349a93..7fd1abe016 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/UnitTestLogger.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/UnitTestLogger.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit;
+package org.apache.activemq.artemis.tests.unit;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AIOTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AIOTestBase.java
similarity index 92%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AIOTestBase.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AIOTestBase.java
index 7b92dbbed9..d0d5db4aaa 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AIOTestBase.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AIOTestBase.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.asyncio;
+package org.apache.activemq.artemis.tests.unit.core.asyncio;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.core.asyncio.AIOCallback;
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.asyncio.AIOCallback;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AsynchronousFileTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AsynchronousFileTest.java
similarity index 91%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AsynchronousFileTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AsynchronousFileTest.java
index 994a1dcaa1..4e099837f4 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/AsynchronousFileTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AsynchronousFileTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.asyncio;
+package org.apache.activemq.artemis.tests.unit.core.asyncio;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -33,14 +33,14 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.core.asyncio.AIOCallback;
-import org.apache.activemq.core.asyncio.BufferCallback;
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.ActiveMQThreadFactory;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.core.asyncio.AIOCallback;
+import org.apache.activemq.artemis.core.asyncio.BufferCallback;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -169,7 +169,7 @@ public class AsynchronousFileTest extends AIOTestBase
          }
       });
 
-      Assert.assertTrue(latch.await(10, TimeUnit.SECONDS));
+      assertTrue(latch.await(10, TimeUnit.SECONDS));
 
       WeakReference bufferCheck2 = new WeakReference(write);
 
@@ -179,7 +179,7 @@ public class AsynchronousFileTest extends AIOTestBase
 
       UnitTestCase.forceGC(bufferCheck2, 5000);
 
-      Assert.assertNull(bufferCheck2.get());
+      assertNull(bufferCheck2.get());
 
       controller.close();
 
@@ -187,7 +187,7 @@ public class AsynchronousFileTest extends AIOTestBase
 
       UnitTestCase.forceGC(bufferCheck, 5000);
 
-      Assert.assertNull(bufferCheck.get());
+      assertNull(bufferCheck.get());
    }
 
    @Test
@@ -199,7 +199,7 @@ public class AsynchronousFileTest extends AIOTestBase
          try
          {
             controller.open("/non-existent/IDontExist.error", 10000);
-            Assert.fail("Exception expected! The test could create a file called /non-existent/IDontExist.error when it was supposed to fail.");
+            fail("Exception expected! The test could create a file called /non-existent/IDontExist.error when it was supposed to fail.");
          }
          catch (Exception ignored)
          {
@@ -207,7 +207,7 @@ public class AsynchronousFileTest extends AIOTestBase
          try
          {
             controller.close();
-            Assert.fail("Supposed to throw exception as the file wasn't opened");
+            fail("Supposed to throw exception as the file wasn't opened");
          }
          catch (Exception ignored)
          {
@@ -280,17 +280,17 @@ public class AsynchronousFileTest extends AIOTestBase
 
          for (CountDownCallback callback : list)
          {
-            Assert.assertEquals(1, callback.timesDoneCalled.get());
-            Assert.assertTrue(callback.doneCalled);
+            assertEquals(1, callback.timesDoneCalled.get());
+            assertTrue(callback.doneCalled);
          }
 
          for (CountDownCallback callback : list2)
          {
-            Assert.assertEquals(1, callback.timesDoneCalled.get());
-            Assert.assertTrue(callback.doneCalled);
+            assertEquals(1, callback.timesDoneCalled.get());
+            assertTrue(callback.doneCalled);
          }
 
-         Assert.assertEquals(0, errors.get());
+         assertEquals(0, errors.get());
 
          controller.close();
       }
@@ -394,7 +394,7 @@ public class AsynchronousFileTest extends AIOTestBase
 
             waitForLatch(callbackLocal.latch);
 
-            Assert.assertTrue(callbackLocal.error);
+            assertTrue(callbackLocal.error);
 
          }
          finally
@@ -415,7 +415,7 @@ public class AsynchronousFileTest extends AIOTestBase
 
             controller.read(0, 512, newBuffer, callbackLocal);
 
-            Assert.fail("An exception was supposed to be thrown");
+            fail("An exception was supposed to be thrown");
          }
          catch (ActiveMQException ignored)
          {
@@ -430,7 +430,7 @@ public class AsynchronousFileTest extends AIOTestBase
             callbackLocal = new LocalCallback();
             controller.read(0, 512, newBuffer, callbackLocal);
             waitForLatch(callbackLocal.latch);
-            Assert.assertFalse(callbackLocal.error);
+            assertFalse(callbackLocal.error);
 
             newBuffer.rewind();
 
@@ -440,7 +440,7 @@ public class AsynchronousFileTest extends AIOTestBase
 
             for (int i = 0; i < SIZE; i++)
             {
-               Assert.assertEquals((byte) (i % 100), bytesRead[i]);
+               assertEquals((byte) (i % 100), bytesRead[i]);
             }
          }
          finally
@@ -515,7 +515,7 @@ public class AsynchronousFileTest extends AIOTestBase
          }
          else
          {
-            Assert.assertTrue(lineOne != bufferTmp);
+            assertTrue(lineOne != bufferTmp);
          }
       }
 
@@ -579,7 +579,7 @@ public class AsynchronousFileTest extends AIOTestBase
 
       CountDownCallback.checkResults(NUMBER_LINES, result);
 
-      Assert.assertEquals(NUMBER_LINES, buffers.size());
+      assertEquals(NUMBER_LINES, buffers.size());
 
       // Make sure all the buffers are unique
       ByteBuffer lineOne = null;
@@ -591,7 +591,7 @@ public class AsynchronousFileTest extends AIOTestBase
          }
          else
          {
-            Assert.assertTrue(lineOne == bufferTmp);
+            assertTrue(lineOne == bufferTmp);
          }
       }
 
@@ -635,7 +635,7 @@ public class AsynchronousFileTest extends AIOTestBase
 
          waitForLatch(latch);
 
-         Assert.assertEquals(0, errors.get());
+         assertEquals(0, errors.get());
 
          CountDownCallback.checkResults(NUMBER_LINES, result);
       }
@@ -664,8 +664,8 @@ public class AsynchronousFileTest extends AIOTestBase
          controller.read(i * SIZE, SIZE, buffer, aio);
 
          waitForLatch(latch);
-         Assert.assertEquals(0, errors.get());
-         Assert.assertTrue(aio.doneCalled);
+         assertEquals(0, errors.get());
+         assertTrue(aio.doneCalled);
 
          byte[] bytesRead = new byte[SIZE];
          buffer.get(bytesRead);
@@ -720,7 +720,7 @@ public class AsynchronousFileTest extends AIOTestBase
 
       controller.setBufferCallback(null);
 
-      Assert.assertEquals(0, readLatch.getCount());
+      assertEquals(0, readLatch.getCount());
       waitForLatch(readLatch);
       controller.open(fileName, 10);
 
@@ -742,8 +742,8 @@ public class AsynchronousFileTest extends AIOTestBase
          CountDownCallback aio = new CountDownCallback(latch, null, null, 0);
          controller.read(i * SIZE, SIZE, buffer, aio);
          waitForLatch(latch);
-         Assert.assertEquals(0, aio.errorCalled);
-         Assert.assertTrue(aio.doneCalled);
+         assertEquals(0, aio.errorCalled);
+         assertTrue(aio.doneCalled);
 
          byte[] bytesRead = new byte[SIZE];
          byte[] bytesCompare = new byte[SIZE];
@@ -755,12 +755,12 @@ public class AsynchronousFileTest extends AIOTestBase
 
          for (int count = 0; count < SIZE; count++)
          {
-            Assert.assertEquals("byte position " + count + " differs on line " + i,
+            assertEquals("byte position " + count + " differs on line " + i,
                                 bytesCompare[count],
                                 bytesRead[count]);
          }
 
-         Assert.assertTrue(buffer.equals(newBuffer));
+         assertTrue(buffer.equals(newBuffer));
       }
 
       destroy(newBuffer);
@@ -823,9 +823,9 @@ public class AsynchronousFileTest extends AIOTestBase
 
       for (CountDownCallback tmp : list)
       {
-         Assert.assertEquals(1, tmp.timesDoneCalled.get());
-         Assert.assertTrue(tmp.doneCalled);
-         Assert.assertEquals(0, tmp.errorCalled);
+         assertEquals(1, tmp.timesDoneCalled.get());
+         assertTrue(tmp.doneCalled);
+         assertEquals(0, tmp.errorCalled);
       }
 
       controller.close();
@@ -854,8 +854,8 @@ public class AsynchronousFileTest extends AIOTestBase
          CountDownCallback aioBlock = new CountDownCallback(latchDone, null, null, 0);
          controller.write(i * 512, 512, buffer, aioBlock);
          UnitTestCase.waitForLatch(latchDone);
-         Assert.assertTrue(aioBlock.doneCalled);
-         Assert.assertEquals(0, aioBlock.errorCalled);
+         assertTrue(aioBlock.doneCalled);
+         assertEquals(0, aioBlock.errorCalled);
       }
 
       long timeTotal = System.currentTimeMillis() - startTime;
@@ -924,8 +924,8 @@ public class AsynchronousFileTest extends AIOTestBase
 
       UnitTestCase.waitForLatch(latchDone);
 
-      Assert.assertTrue(aioBlock.errorCalled != 0);
-      Assert.assertFalse(aioBlock.doneCalled);
+      assertTrue(aioBlock.errorCalled != 0);
+      assertFalse(aioBlock.doneCalled);
    }
 
    @Test
@@ -935,7 +935,7 @@ public class AsynchronousFileTest extends AIOTestBase
       {
          @SuppressWarnings("unused")
          ByteBuffer buffer = AsynchronousFileImpl.newBuffer(300);
-         Assert.fail("Exception expected");
+         fail("Exception expected");
       }
       catch (Exception ignored)
       {
@@ -989,7 +989,7 @@ public class AsynchronousFileTest extends AIOTestBase
          t.join();
       }
 
-      Assert.assertEquals(0, errors.get());
+      assertEquals(0, errors.get());
    }
 
    @Test
@@ -1004,7 +1004,7 @@ public class AsynchronousFileTest extends AIOTestBase
 
       controller.fill(0, 1, NUMBER_LINES * SIZE, (byte) 'j');
 
-      Assert.assertEquals(NUMBER_LINES * SIZE, controller.size());
+      assertEquals(NUMBER_LINES * SIZE, controller.size());
    }
 
    private static void addString(final String str, final ByteBuffer buffer)
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java
similarity index 90%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java
index 37238f238b..560735f4a5 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.asyncio;
+package org.apache.activemq.artemis.tests.unit.core.asyncio;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -24,15 +24,14 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.core.asyncio.AIOCallback;
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.ActiveMQThreadFactory;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.asyncio.AIOCallback;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -211,7 +210,7 @@ public class MultiThreadAsynchronousFileTest extends AIOTestBase
             buffer.put((byte) '\n');
 
             latchStart.countDown();
-            UnitTestCase.waitForLatch(latchStart);
+            waitForLatch(latchStart);
 
             CountDownLatch latchFinishThread = null;
 
@@ -237,26 +236,26 @@ public class MultiThreadAsynchronousFileTest extends AIOTestBase
                addData(libaio, buffer, callback);
                if (sync)
                {
-                  UnitTestCase.waitForLatch(latchFinishThread);
-                  Assert.assertTrue(callback.doneCalled);
-                  Assert.assertFalse(callback.errorCalled != 0);
+                  waitForLatch(latchFinishThread);
+                  assertTrue(callback.doneCalled);
+                  assertFalse(callback.errorCalled != 0);
                }
             }
             if (!sync)
             {
-               UnitTestCase.waitForLatch(latchFinishThread);
+               waitForLatch(latchFinishThread);
             }
 
             for (CountDownCallback callback : list)
             {
-               Assert.assertTrue(callback.doneCalled);
-               Assert.assertFalse(callback.errorCalled != 0);
+               assertTrue(callback.doneCalled);
+               assertFalse(callback.errorCalled != 0);
             }
 
             for (CountDownCallback callback : list)
             {
-               Assert.assertTrue(callback.doneCalled);
-               Assert.assertFalse(callback.errorCalled != 0);
+               assertTrue(callback.doneCalled);
+               assertFalse(callback.errorCalled != 0);
             }
 
          }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/client/impl/LargeMessageBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/client/impl/LargeMessageBufferTest.java
similarity index 94%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/client/impl/LargeMessageBufferTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/client/impl/LargeMessageBufferTest.java
index d8b85ebaa1..71b78b0fd5 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/client/impl/LargeMessageBufferTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/client/impl/LargeMessageBufferTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.client.impl;
+package org.apache.activemq.artemis.tests.unit.core.client.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,24 +29,24 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.core.client.impl.ClientConsumerInternal;
-import org.apache.activemq.core.client.impl.ClientLargeMessageInternal;
-import org.apache.activemq.core.client.impl.ClientMessageInternal;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.core.client.impl.LargeMessageControllerImpl;
-import org.apache.activemq.core.protocol.core.impl.ActiveMQConsumerContext;
-import org.apache.activemq.spi.core.remoting.ConsumerContext;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.FutureLatch;
-import org.apache.activemq.utils.ActiveMQBufferInputStream;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientLargeMessageInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientMessageInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.client.impl.LargeMessageControllerImpl;
+import org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQConsumerContext;
+import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.FutureLatch;
+import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -918,7 +918,7 @@ public class LargeMessageBufferTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.client.impl.ClientConsumerInternal#getNonXAsession()
+       * @see org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal#getNonXAsession()
        */
       public ClientSessionInternal getSession()
       {
@@ -927,7 +927,7 @@ public class LargeMessageBufferTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.client.impl.ClientConsumerInternal#prepareForClose()
+       * @see org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal#prepareForClose()
        */
       public Thread prepareForClose(FutureLatch future) throws ActiveMQException
       {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
similarity index 87%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
index 3d7bd268e2..48f3f9d41f 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.config.impl;
+package org.apache.activemq.artemis.tests.unit.core.config.impl;
 
-import org.apache.activemq.core.config.FileDeploymentManager;
+import org.apache.activemq.artemis.core.config.FileDeploymentManager;
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.config.impl.FileConfiguration;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.XMLUtil;
+import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.XMLUtil;
 import org.w3c.dom.Element;
 
 public class ConfigurationValidationTest extends UnitTestCase
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConnectorsServiceTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java
similarity index 82%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConnectorsServiceTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java
index 47db4e8a9f..b508feb6d9 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConnectorsServiceTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.config.impl;
+package org.apache.activemq.artemis.tests.unit.core.config.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.ConnectorServiceConfiguration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.server.ConnectorService;
-import org.apache.activemq.core.server.impl.ConnectorsService;
-import org.apache.activemq.core.server.impl.ServiceRegistry;
-import org.apache.activemq.tests.unit.core.config.impl.fakes.FakeConnectorService;
-import org.apache.activemq.tests.unit.core.config.impl.fakes.FakeConnectorServiceFactory;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tests.unit.core.config.impl.fakes.FakeConnectorServiceFactory;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.server.ConnectorService;
+import org.apache.activemq.artemis.core.server.impl.ConnectorsService;
+import org.apache.activemq.artemis.core.server.impl.ServiceRegistry;
+import org.apache.activemq.artemis.tests.unit.core.config.impl.fakes.FakeConnectorService;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/TransportConfigurationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/TransportConfigurationTest.java
similarity index 92%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/TransportConfigurationTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/TransportConfigurationTest.java
index d1eee6156c..41058d9639 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/TransportConfigurationTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/TransportConfigurationTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.config.impl;
+package org.apache.activemq.artemis.tests.unit.core.config.impl;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
 
 public class TransportConfigurationTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/fakes/FakeConnectorService.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/fakes/FakeConnectorService.java
similarity index 89%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/fakes/FakeConnectorService.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/fakes/FakeConnectorService.java
index 5026ad260d..fe078b10cd 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/fakes/FakeConnectorService.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/fakes/FakeConnectorService.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.config.impl.fakes;
+package org.apache.activemq.artemis.tests.unit.core.config.impl.fakes;
 
-import org.apache.activemq.core.server.ConnectorService;
+import org.apache.activemq.artemis.core.server.ConnectorService;
 
 public class FakeConnectorService implements ConnectorService
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java
similarity index 84%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java
index 48ebd55700..41fd5d0b90 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.config.impl.fakes;
+package org.apache.activemq.artemis.tests.unit.core.config.impl.fakes;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.server.ConnectorService;
-import org.apache.activemq.core.server.ConnectorServiceFactory;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.server.ConnectorService;
+import org.apache.activemq.artemis.core.server.ConnectorServiceFactory;
 
 public class FakeConnectorServiceFactory implements ConnectorServiceFactory
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/AlignedJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
similarity index 97%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/AlignedJournalImplTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
index 5bb8f42477..9a99707b0b 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/AlignedJournalImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -31,18 +33,16 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.journal.EncodingSupport;
-import org.apache.activemq.core.journal.LoaderCallback;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFile;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.TransactionFailureCallback;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.SimpleEncoding;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.EncodingSupport;
+import org.apache.activemq.artemis.core.journal.LoaderCallback;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFile;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.TransactionFailureCallback;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
 
 public class AlignedJournalImplTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/CleanBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/CleanBufferTest.java
similarity index 85%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/CleanBufferTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/CleanBufferTest.java
index dce7c88a90..980a4a64c3 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/CleanBufferTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/CleanBufferTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl;
 
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.nio.ByteBuffer;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
 
 public class CleanBufferTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FakeJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FakeJournalImplTest.java
similarity index 82%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FakeJournalImplTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FakeJournalImplTest.java
index 6e3f7feef0..1665d99691 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FakeJournalImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FakeJournalImplTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
 
 public class FakeJournalImplTest extends JournalImplTestUnit
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java
similarity index 81%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java
index ed8cd6f148..ed32467931 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl;
 
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
 
 public class FakeSequentialFileFactoryTest extends SequentialFileFactoryTestBase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FileFactoryTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FileFactoryTestBase.java
similarity index 87%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FileFactoryTestBase.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FileFactoryTestBase.java
index d4bfb442da..c1a6e5f761 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/FileFactoryTestBase.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FileFactoryTestBase.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 
 import java.nio.ByteBuffer;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.journal.SequentialFile;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.SequentialFile;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
 
 public abstract class FileFactoryTestBase extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalAsyncTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java
similarity index 92%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalAsyncTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java
index 116d8c0bd8..b6b1cce7ff 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalAsyncTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl;
 
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.SimpleEncoding;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
similarity index 95%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestBase.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
index 2d5d810741..0bf7928eb0 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestBase.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl;
-import org.apache.activemq.tools.ExportJournal;
-import org.apache.activemq.tools.ImportJournal;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tools.ExportJournal;
+import org.apache.activemq.artemis.tools.ImportJournal;
 import org.junit.Before;
 import org.junit.After;
 
@@ -32,14 +33,13 @@ import java.util.Map;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.journal.EncodingSupport;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.TestableJournal;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.ReusableLatch;
+import org.apache.activemq.artemis.core.journal.EncodingSupport;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.TestableJournal;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.utils.ReusableLatch;
 
 public abstract class JournalImplTestBase extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestUnit.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
similarity index 99%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestUnit.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
index f96b6c7930..3a217d8c10 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/JournalImplTestUnit.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl;
 
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQIOErrorException;
-import org.apache.activemq.core.journal.EncodingSupport;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.SequentialFile;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.SimpleEncoding;
-import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQIOErrorException;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
+import org.apache.activemq.artemis.core.journal.EncodingSupport;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.SequentialFile;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -42,7 +42,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase
       for (String file : files)
       {
          SequentialFile seqFile = fileFactory.createSequentialFile(file, 1);
-         assertEquals(fileSize, seqFile.size());
+         Assert.assertEquals(fileSize, seqFile.size());
       }
 
       super.tearDown();
@@ -256,10 +256,10 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase
       }
       catch (ActiveMQException e)
       {
-         fail("invalid exception type:" + e.getType());
+         Assert.fail("invalid exception type:" + e.getType());
       }
 
-      assertTrue("Exception was expected", exceptionHappened);
+      Assert.assertTrue("Exception was expected", exceptionHappened);
       stopJournal();
 
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/ReclaimerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java
similarity index 92%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/ReclaimerTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java
index 87a6e62070..bcdd00cc46 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/ReclaimerTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 
 import org.junit.Test;
@@ -26,11 +27,10 @@ import java.util.Set;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.journal.SequentialFile;
-import org.apache.activemq.core.journal.impl.JournalFile;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.Reclaimer;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.SequentialFile;
+import org.apache.activemq.artemis.core.journal.impl.JournalFile;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.Reclaimer;
 
 public class ReclaimerTest extends UnitTestCase
 {
@@ -910,14 +910,14 @@ public class ReclaimerTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#decPendingTransaction()
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#decPendingTransaction()
        */
       public void decPendingTransaction()
       {
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#getPendingTransactions()
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#getPendingTransactions()
        */
       public int getPendingTransactions()
       {
@@ -925,14 +925,14 @@ public class ReclaimerTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#incPendingTransaction()
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#incPendingTransaction()
        */
       public void incPendingTransaction()
       {
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#getOrderingID()
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#getOrderingID()
        */
       public int getOrderingID()
       {
@@ -949,7 +949,7 @@ public class ReclaimerTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#getSize()
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#getSize()
        */
       public int getLiveSize()
       {
@@ -957,7 +957,7 @@ public class ReclaimerTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#isNeedCleanup()
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#isNeedCleanup()
        */
       public boolean isNeedCleanup()
       {
@@ -965,7 +965,7 @@ public class ReclaimerTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#resetNegCount(org.apache.activemq.core.journal.impl.JournalFile)
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#resetNegCount(org.apache.activemq.artemis.core.journal.impl.JournalFile)
        */
       public boolean resetNegCount(final JournalFile file)
       {
@@ -973,7 +973,7 @@ public class ReclaimerTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#setNeedCleanup(boolean)
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#setNeedCleanup(boolean)
        */
       public void setNeedCleanup(final boolean needCleanup)
       {
@@ -982,7 +982,7 @@ public class ReclaimerTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#getRecordID()
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#getRecordID()
        */
       public int getRecordID()
       {
@@ -990,7 +990,7 @@ public class ReclaimerTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#getTotalNegativeToOthers()
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#getTotalNegativeToOthers()
        */
       public int getTotalNegativeToOthers()
       {
@@ -998,7 +998,7 @@ public class ReclaimerTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#getJournalVersion()
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#getJournalVersion()
        */
       public int getJournalVersion()
       {
@@ -1006,7 +1006,7 @@ public class ReclaimerTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#getTotNeg()
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#getTotNeg()
        */
       public int getTotNeg()
       {
@@ -1015,7 +1015,7 @@ public class ReclaimerTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.impl.JournalFile#setTotNeg(int)
+       * @see org.apache.activemq.artemis.core.journal.impl.JournalFile#setTotNeg(int)
        */
       public void setTotNeg(int totNeg)
       {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
similarity index 96%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
index a33e5c27bb..5c5914baec 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl;
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -30,10 +31,9 @@ import java.util.UUID;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.journal.SequentialFile;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.journal.SequentialFile;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
 
 public abstract class SequentialFileFactoryTestBase extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/TimedBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
similarity index 95%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/TimedBufferTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
index c70dad4dcc..efd2b374c0 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/TimedBufferTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.nio.ByteBuffer;
@@ -29,10 +30,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.journal.IOAsyncTask;
-import org.apache.activemq.core.journal.impl.TimedBuffer;
-import org.apache.activemq.core.journal.impl.TimedBufferObserver;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.IOAsyncTask;
+import org.apache.activemq.artemis.core.journal.impl.TimedBuffer;
+import org.apache.activemq.artemis.core.journal.impl.TimedBufferObserver;
 
 public class TimedBufferTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
similarity index 87%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
index cf63ad76ca..4471819b32 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl.fakes;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,15 +24,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.core.asyncio.BufferCallback;
-import org.apache.activemq.core.journal.EncodingSupport;
-import org.apache.activemq.core.journal.IOAsyncTask;
-import org.apache.activemq.core.journal.SequentialFile;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.TimedBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.core.asyncio.BufferCallback;
+import org.apache.activemq.artemis.core.journal.EncodingSupport;
+import org.apache.activemq.artemis.core.journal.IOAsyncTask;
+import org.apache.activemq.artemis.core.journal.SequentialFile;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.TimedBuffer;
 
 public class FakeSequentialFileFactory implements SequentialFileFactory
 {
@@ -485,7 +485,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#writeInternal(java.nio.ByteBuffer)
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#writeInternal(java.nio.ByteBuffer)
        */
       public void writeInternal(ByteBuffer bytes) throws Exception
       {
@@ -555,7 +555,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#renameTo(org.apache.activemq.core.journal.SequentialFile)
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#renameTo(org.apache.activemq.artemis.core.journal.SequentialFile)
        */
       public void renameTo(final String newFileName) throws Exception
       {
@@ -565,7 +565,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#fits(int)
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#fits(int)
        */
       public boolean fits(final int size)
       {
@@ -573,21 +573,21 @@ public class FakeSequentialFileFactory implements SequentialFileFactory
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#setBuffering(boolean)
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#setBuffering(boolean)
        */
       public void setBuffering(final boolean buffering)
       {
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#lockBuffer()
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#lockBuffer()
        */
       public void disableAutoFlush()
       {
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#unlockBuffer()
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#unlockBuffer()
        */
       public void enableAutoFlush()
       {
@@ -599,7 +599,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#write(org.apache.activemq.spi.core.remoting.ActiveMQBuffer, boolean, org.apache.activemq.core.journal.IOCallback)
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#write(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer, boolean, org.apache.activemq.artemis.core.journal.IOCallback)
        */
       public void write(final ActiveMQBuffer bytes, final boolean sync, final IOAsyncTask callback) throws Exception
       {
@@ -610,7 +610,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#write(org.apache.activemq.spi.core.remoting.ActiveMQBuffer, boolean)
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#write(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer, boolean)
        */
       public void write(final ActiveMQBuffer bytes, final boolean sync) throws Exception
       {
@@ -620,7 +620,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#write(org.apache.activemq.core.journal.EncodingSupport, boolean, org.apache.activemq.core.journal.IOCompletion)
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#write(org.apache.activemq.artemis.core.journal.EncodingSupport, boolean, org.apache.activemq.artemis.core.journal.IOCompletion)
        */
       public void write(final EncodingSupport bytes, final boolean sync, final IOAsyncTask callback) throws Exception
       {
@@ -631,7 +631,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#write(org.apache.activemq.core.journal.EncodingSupport, boolean)
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#write(org.apache.activemq.artemis.core.journal.EncodingSupport, boolean)
        */
       public void write(final EncodingSupport bytes, final boolean sync) throws Exception
       {
@@ -642,7 +642,7 @@ public class FakeSequentialFileFactory implements SequentialFileFactory
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#exists()
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#exists()
        */
       public boolean exists()
       {
@@ -652,14 +652,14 @@ public class FakeSequentialFileFactory implements SequentialFileFactory
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#setTimedBuffer(org.apache.activemq.core.journal.impl.TimedBuffer)
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#setTimedBuffer(org.apache.activemq.artemis.core.journal.impl.TimedBuffer)
        */
       public void setTimedBuffer(final TimedBuffer buffer)
       {
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.journal.SequentialFile#copyTo(org.apache.activemq.core.journal.SequentialFile)
+       * @see org.apache.activemq.artemis.core.journal.SequentialFile#copyTo(org.apache.activemq.artemis.core.journal.SequentialFile)
        */
       public void copyTo(SequentialFile newFileName)
       {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/SimpleEncoding.java
similarity index 91%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/SimpleEncoding.java
index 29aeec0b7c..841a6bedb6 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/SimpleEncoding.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.journal.impl.fakes;
+package org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.core.journal.EncodingSupport;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.core.journal.EncodingSupport;
 
 /**
  * Provides a SimpleEncoding with a Fake Payload
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/message/impl/MessageImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
similarity index 95%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/message/impl/MessageImplTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
index fa0fca9ec5..49cdf32d73 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/message/impl/MessageImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.message.impl;
+package org.apache.activemq.artemis.tests.unit.core.message.impl;
 
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.client.impl.ClientMessageImpl;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl;
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagePositionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java
similarity index 92%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagePositionTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java
index bc09381e67..dc8c884608 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagePositionTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.paging.impl;
+package org.apache.activemq.artemis.tests.unit.core.paging.impl;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
-import org.apache.activemq.tests.util.UnitTestCase;
-
 public class PagePositionTest extends UnitTestCase
 {
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java
similarity index 88%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PageTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java
index f987c7bc66..d4dd29534e 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PageTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.paging.impl;
+package org.apache.activemq.artemis.tests.unit.core.paging.impl;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.journal.SequentialFile;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.core.paging.PagedMessage;
-import org.apache.activemq.core.paging.impl.Page;
-import org.apache.activemq.core.paging.impl.PagedMessageImpl;
-import org.apache.activemq.core.persistence.impl.nullpm.NullStorageManager;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.SequentialFile;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.paging.PagedMessage;
+import org.apache.activemq.artemis.core.paging.impl.Page;
+import org.apache.activemq.artemis.core.paging.impl.PagedMessageImpl;
+import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java
similarity index 76%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingManagerImplTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java
index 8b7e293b9f..47a9e98955 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingManagerImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.paging.impl;
+package org.apache.activemq.artemis.tests.unit.core.paging.impl;
 
 import java.io.File;
 import java.nio.ByteBuffer;
@@ -22,23 +22,23 @@ import java.util.List;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.paging.PagedMessage;
-import org.apache.activemq.core.paging.PagingStore;
-import org.apache.activemq.core.paging.impl.Page;
-import org.apache.activemq.core.paging.impl.PagingManagerImpl;
-import org.apache.activemq.core.paging.impl.PagingStoreFactoryNIO;
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.persistence.impl.nullpm.NullStorageManager;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.RoutingContextImpl;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.core.settings.HierarchicalRepository;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.paging.PagedMessage;
+import org.apache.activemq.artemis.core.paging.PagingStore;
+import org.apache.activemq.artemis.core.paging.impl.Page;
+import org.apache.activemq.artemis.core.paging.impl.PagingManagerImpl;
+import org.apache.activemq.artemis.core.paging.impl.PagingStoreFactoryNIO;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.RoutingContextImpl;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingStoreImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java
similarity index 93%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingStoreImplTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java
index 753742eaec..5a80874796 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/paging/impl/PagingStoreImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.paging.impl;
+package org.apache.activemq.artemis.tests.unit.core.paging.impl;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -30,33 +30,33 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.journal.SequentialFile;
-import org.apache.activemq.core.journal.SequentialFileFactory;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.core.paging.PageTransactionInfo;
-import org.apache.activemq.core.paging.PagedMessage;
-import org.apache.activemq.core.paging.PagingManager;
-import org.apache.activemq.core.paging.PagingStore;
-import org.apache.activemq.core.paging.PagingStoreFactory;
-import org.apache.activemq.core.paging.impl.Page;
-import org.apache.activemq.core.paging.impl.PageTransactionInfoImpl;
-import org.apache.activemq.core.paging.impl.PagingStoreImpl;
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.persistence.impl.nullpm.NullStorageManager;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.RoutingContextImpl;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.core.settings.HierarchicalRepository;
-import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
-import org.apache.activemq.tests.unit.util.FakePagingManager;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.ExecutorFactory;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.journal.SequentialFile;
+import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.paging.PageTransactionInfo;
+import org.apache.activemq.artemis.core.paging.PagedMessage;
+import org.apache.activemq.artemis.core.paging.PagingManager;
+import org.apache.activemq.artemis.core.paging.PagingStore;
+import org.apache.activemq.artemis.core.paging.PagingStoreFactory;
+import org.apache.activemq.artemis.core.paging.impl.Page;
+import org.apache.activemq.artemis.core.paging.impl.PageTransactionInfoImpl;
+import org.apache.activemq.artemis.core.paging.impl.PagingStoreImpl;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.RoutingContextImpl;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
+import org.apache.activemq.artemis.tests.unit.util.FakePagingManager;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.ExecutorFactory;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java
similarity index 83%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java
index f6aa94f731..37fabd54aa 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.persistence.impl;
+package org.apache.activemq.artemis.tests.unit.core.persistence.impl;
 import java.util.ArrayList;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
-import org.apache.activemq.core.journal.Journal;
-import org.apache.activemq.core.journal.PreparedTransactionInfo;
-import org.apache.activemq.core.journal.RecordInfo;
-import org.apache.activemq.core.journal.impl.JournalImpl;
-import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory;
-import org.apache.activemq.core.persistence.StorageManager;
-import org.apache.activemq.core.persistence.impl.journal.BatchingIDGenerator;
-import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds;
-import org.apache.activemq.core.persistence.impl.nullpm.NullStorageManager;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.Journal;
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
+import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.persistence.impl.journal.BatchingIDGenerator;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds;
+import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/OperationContextUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java
similarity index 94%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/OperationContextUnitTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java
index 6cb894f553..7faf089eca 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/persistence/impl/OperationContextUnitTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.persistence.impl;
+package org.apache.activemq.artemis.tests.unit.core.persistence.impl;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -22,10 +22,10 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.core.journal.IOAsyncTask;
-import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.journal.IOAsyncTask;
+import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/AddressImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java
similarity index 96%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/AddressImplTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java
index 541e0e01e4..e541a452e6 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/AddressImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.postoffice.impl;
+package org.apache.activemq.artemis.tests.unit.core.postoffice.impl;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.postoffice.Address;
-import org.apache.activemq.core.postoffice.impl.AddressImpl;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.postoffice.Address;
+import org.apache.activemq.artemis.core.postoffice.impl.AddressImpl;
 
 public class AddressImplTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/BindingsImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java
similarity index 75%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/BindingsImplTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java
index ecf3e58ff2..330ee6126f 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/BindingsImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.postoffice.impl;
+package org.apache.activemq.artemis.tests.unit.core.postoffice.impl;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.core.server.impl.RefsOperation;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.server.impl.RefsOperation;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -26,21 +27,20 @@ import java.util.Set;
 
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.BindingType;
-import org.apache.activemq.core.postoffice.Bindings;
-import org.apache.activemq.core.postoffice.impl.BindingsImpl;
-import org.apache.activemq.core.server.Bindable;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.RoutingContext;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.RoutingContextImpl;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.core.transaction.Transaction;
-import org.apache.activemq.core.transaction.TransactionOperation;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.BindingType;
+import org.apache.activemq.artemis.core.postoffice.Bindings;
+import org.apache.activemq.artemis.core.postoffice.impl.BindingsImpl;
+import org.apache.activemq.artemis.core.server.Bindable;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.RoutingContext;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.RoutingContextImpl;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.artemis.core.transaction.Transaction;
+import org.apache.activemq.artemis.core.transaction.TransactionOperation;
 
 public class BindingsImplTest extends UnitTestCase
 {
@@ -199,7 +199,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.transaction.Transaction#rollback()
+       * @see org.apache.activemq.artemis.core.transaction.Transaction#rollback()
        */
       public void rollback() throws Exception
       {
@@ -207,7 +207,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.transaction.Transaction#setState(org.apache.activemq.core.transaction.Transaction.State)
+       * @see org.apache.activemq.artemis.core.transaction.Transaction#setState(org.apache.activemq.artemis.core.transaction.Transaction.State)
        */
       public void setState(final State state)
       {
@@ -215,7 +215,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.transaction.Transaction#suspend()
+       * @see org.apache.activemq.artemis.core.transaction.Transaction#suspend()
        */
       public void suspend()
       {
@@ -223,7 +223,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.transaction.Transaction#getDistinctQueues()
+       * @see org.apache.activemq.artemis.core.transaction.Transaction#getDistinctQueues()
        */
       public Set getDistinctQueues()
       {
@@ -262,7 +262,7 @@ public class BindingsImplTest extends UnitTestCase
    {
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.filter.Filter#getFilterString()
+       * @see org.apache.activemq.artemis.core.filter.Filter#getFilterString()
        */
       public SimpleString getFilterString()
       {
@@ -270,7 +270,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.filter.Filter#match(org.apache.activemq.core.server.ServerMessage)
+       * @see org.apache.activemq.artemis.core.filter.Filter#match(org.apache.activemq.artemis.core.server.ServerMessage)
        */
       public boolean match(final ServerMessage message)
       {
@@ -307,7 +307,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.postoffice.Binding#getBindable()
+       * @see org.apache.activemq.artemis.core.postoffice.Binding#getBindable()
        */
       public Bindable getBindable()
       {
@@ -316,7 +316,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.postoffice.Binding#getClusterName()
+       * @see org.apache.activemq.artemis.core.postoffice.Binding#getClusterName()
        */
       public SimpleString getClusterName()
       {
@@ -325,7 +325,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.postoffice.Binding#getDistance()
+       * @see org.apache.activemq.artemis.core.postoffice.Binding#getDistance()
        */
       public int getDistance()
       {
@@ -333,7 +333,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.postoffice.Binding#getFilter()
+       * @see org.apache.activemq.artemis.core.postoffice.Binding#getFilter()
        */
       public Filter getFilter()
       {
@@ -346,7 +346,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.postoffice.Binding#getRoutingName()
+       * @see org.apache.activemq.artemis.core.postoffice.Binding#getRoutingName()
        */
       public SimpleString getRoutingName()
       {
@@ -354,7 +354,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.postoffice.Binding#getType()
+       * @see org.apache.activemq.artemis.core.postoffice.Binding#getType()
        */
       public BindingType getType()
       {
@@ -363,7 +363,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.postoffice.Binding#getUniqueName()
+       * @see org.apache.activemq.artemis.core.postoffice.Binding#getUniqueName()
        */
       public SimpleString getUniqueName()
       {
@@ -386,7 +386,7 @@ public class BindingsImplTest extends UnitTestCase
       }
 
       /* (non-Javadoc)
-       * @see org.apache.activemq.core.postoffice.Binding#toManagementString()
+       * @see org.apache.activemq.artemis.core.postoffice.Binding#toManagementString()
        */
       @Override
       public String toManagementString()
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
similarity index 82%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
index 0d23f0e9fc..2c965b3a2a 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.postoffice.impl;
+package org.apache.activemq.artemis.tests.unit.core.postoffice.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,23 +23,23 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.Pair;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.persistence.GroupingInfo;
-import org.apache.activemq.core.persistence.QueueBindingInfo;
-import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.postoffice.impl.DuplicateIDCacheImpl;
-import org.apache.activemq.core.server.impl.PostOfficeJournalLoader;
-import org.apache.activemq.core.transaction.impl.ResourceManagerImpl;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakePostOffice;
-import org.apache.activemq.tests.unit.util.FakePagingManager;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.ServiceTestBase;
-import org.apache.activemq.utils.ExecutorFactory;
-import org.apache.activemq.utils.OrderedExecutorFactory;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.Pair;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice;
+import org.apache.activemq.artemis.tests.unit.util.FakePagingManager;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.persistence.GroupingInfo;
+import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.postoffice.impl.DuplicateIDCacheImpl;
+import org.apache.activemq.artemis.core.server.impl.PostOfficeJournalLoader;
+import org.apache.activemq.artemis.core.transaction.impl.ResourceManagerImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.ExecutorFactory;
+import org.apache.activemq.artemis.utils.OrderedExecutorFactory;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/FakeQueue.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
similarity index 91%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/FakeQueue.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
index b8764ace87..da48d7770b 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/FakeQueue.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.postoffice.impl;
+package org.apache.activemq.artemis.tests.unit.core.postoffice.impl;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executor;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.paging.cursor.PageSubscription;
-import org.apache.activemq.core.server.Consumer;
-import org.apache.activemq.core.server.MessageReference;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.RoutingContext;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.transaction.Transaction;
-import org.apache.activemq.utils.LinkedListIterator;
-import org.apache.activemq.utils.ReferenceCounter;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
+import org.apache.activemq.artemis.core.server.Consumer;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.RoutingContext;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.transaction.Transaction;
+import org.apache.activemq.artemis.utils.LinkedListIterator;
+import org.apache.activemq.artemis.utils.ReferenceCounter;
 
 public class FakeQueue implements Queue
 {
@@ -590,14 +590,14 @@ public class FakeQueue implements Queue
    }
 
    /* (non-Javadoc)
-   * @see org.apache.activemq.core.server.Queue#destroyPaging()
+   * @see org.apache.activemq.artemis.core.server.Queue#destroyPaging()
    */
    public void destroyPaging()
    {
    }
 
    /* (non-Javadoc)
-    * @see org.apache.activemq.core.server.Queue#getDeliveringMessages()
+    * @see org.apache.activemq.artemis.core.server.Queue#getDeliveringMessages()
     */
    @Override
    public Map> getDeliveringMessages()
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/QueueComparatorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/QueueComparatorTest.java
similarity index 88%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/QueueComparatorTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/QueueComparatorTest.java
index 9cf5bbe04f..46a41e9ef4 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/QueueComparatorTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/QueueComparatorTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.postoffice.impl;
+package org.apache.activemq.artemis.tests.unit.core.postoffice.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.impl.ScaleDownHandler;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.impl.ScaleDownHandler;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
similarity index 87%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
index 831c019679..f6360c2c09 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.postoffice.impl;
+package org.apache.activemq.artemis.tests.unit.core.postoffice.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.BindingType;
-import org.apache.activemq.core.postoffice.Bindings;
-import org.apache.activemq.core.postoffice.BindingsFactory;
-import org.apache.activemq.core.postoffice.impl.WildcardAddressManager;
-import org.apache.activemq.core.server.Bindable;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.RoutingContext;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.BindingType;
+import org.apache.activemq.artemis.core.postoffice.Bindings;
+import org.apache.activemq.artemis.core.postoffice.BindingsFactory;
+import org.apache.activemq.artemis.core.postoffice.impl.WildcardAddressManager;
+import org.apache.activemq.artemis.core.server.Bindable;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.RoutingContext;
+import org.apache.activemq.artemis.core.server.ServerMessage;
 import org.junit.Test;
 
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/ActiveMQBufferTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java
similarity index 96%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/ActiveMQBufferTestBase.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java
index 3a86fddf46..c93a3bbda2 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/ActiveMQBufferTestBase.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.remoting;
-import org.apache.activemq.api.core.ActiveMQBuffer;
+package org.apache.activemq.artemis.tests.unit.core.remoting;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -23,9 +24,8 @@ import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public abstract class ActiveMQBufferTestBase extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java
similarity index 87%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java
index cd88102624..2afcb6fee8 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.remoting.impl.invm;
+package org.apache.activemq.artemis.tests.unit.core.remoting.impl.invm;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnector;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnector;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
similarity index 86%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
index d9c6f91103..78ef234d4c 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.remoting.impl.netty;
+package org.apache.activemq.artemis.tests.unit.core.remoting.impl.netty;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
-import org.apache.activemq.tests.unit.core.remoting.ActiveMQBufferTestBase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.tests.unit.core.remoting.ActiveMQBufferTestBase;
 
 /**
  * Same as ChannelBufferWrapperTest, but using a different constructor
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
similarity index 75%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
index cbe2ee9688..ef018ca32f 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.remoting.impl.netty;
+package org.apache.activemq.artemis.tests.unit.core.remoting.impl.netty;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executors;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.server.ActiveMQComponent;
-import org.apache.activemq.spi.core.remoting.Acceptor;
-import org.apache.activemq.spi.core.remoting.BufferHandler;
-import org.apache.activemq.spi.core.remoting.Connection;
-import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.spi.core.remoting.Acceptor;
+import org.apache.activemq.artemis.spi.core.remoting.BufferHandler;
+import org.apache.activemq.artemis.spi.core.remoting.Connection;
+import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
similarity index 82%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
index 6494dde8f4..8ac99f7636 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.remoting.impl.netty;
+package org.apache.activemq.artemis.tests.unit.core.remoting.impl.netty;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,16 +22,16 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQComponent;
-import org.apache.activemq.spi.core.remoting.BufferHandler;
-import org.apache.activemq.spi.core.remoting.Connection;
-import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.spi.core.remoting.BufferHandler;
+import org.apache.activemq.artemis.spi.core.remoting.Connection;
+import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
similarity index 83%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
index 4ff1205144..39dd7afe59 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.remoting.impl.netty;
+package org.apache.activemq.artemis.tests.unit.core.remoting.impl.netty;
 
 import java.nio.ByteBuffer;
 import java.util.Collections;
@@ -23,14 +23,14 @@ import java.util.Map;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.channel.embedded.EmbeddedChannel;
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnection;
-import org.apache.activemq.core.server.ActiveMQComponent;
-import org.apache.activemq.spi.core.remoting.Connection;
-import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection;
+import org.apache.activemq.artemis.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.spi.core.remoting.Connection;
+import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java
similarity index 87%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java
index dbd25e2aa4..9a495b30aa 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.remoting.impl.netty;
+package org.apache.activemq.artemis.tests.unit.core.remoting.impl.netty;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnector;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
similarity index 94%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
index 1ed35fabea..b32a810f95 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.remoting.impl.netty;
+package org.apache.activemq.artemis.tests.unit.core.remoting.impl.netty;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -26,13 +27,12 @@ import java.util.concurrent.Executors;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.remoting.impl.netty.NettyConnector;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.core.server.ActiveMQComponent;
-import org.apache.activemq.spi.core.remoting.BufferHandler;
-import org.apache.activemq.spi.core.remoting.Connection;
-import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.ActiveMQComponent;
+import org.apache.activemq.artemis.spi.core.remoting.BufferHandler;
+import org.apache.activemq.artemis.spi.core.remoting.Connection;
+import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener;
 
 public class NettyConnectorTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
similarity index 96%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
index ed41f1cdae..eb0d19975e 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.remoting.impl.ssl;
+package org.apache.activemq.artemis.tests.unit.core.remoting.impl.ssl;
 
 import java.io.File;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.activemq.core.remoting.impl.ssl.SSLSupport;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java
similarity index 91%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java
index 7af0a44224..25300d30ba 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.remoting.server.impl;
+package org.apache.activemq.artemis.tests.unit.core.remoting.server.impl;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -22,13 +22,13 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.remoting.server.impl.RemotingServiceImpl;
-import org.apache.activemq.core.server.impl.ServiceRegistry;
-import org.apache.activemq.tests.unit.core.remoting.server.impl.fake.FakeInterceptor;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.tests.unit.core.remoting.server.impl.fake.FakeInterceptor;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.remoting.server.impl.RemotingServiceImpl;
+import org.apache.activemq.artemis.core.server.impl.ServiceRegistry;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java
similarity index 75%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java
index c7aa9dfd04..9b128f5d95 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.remoting.server.impl.fake;
+package org.apache.activemq.artemis.tests.unit.core.remoting.server.impl.fake;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public class FakeInterceptor implements Interceptor
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java
similarity index 96%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java
index 7da196d710..5bf1338f22 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.security.impl;
+package org.apache.activemq.artemis.tests.unit.core.security.impl;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 import org.junit.After;
 
@@ -24,10 +25,9 @@ import java.util.HashSet;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.security.CheckType;
-import org.apache.activemq.core.security.Role;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.security.CheckType;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
 
 /**
  * tests ActiveMQSecurityManagerImpl
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java
similarity index 94%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java
index b04ecd2c20..fd763faca5 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.server.cluster.impl;
+package org.apache.activemq.artemis.tests.unit.core.server.cluster.impl;
 
-import org.apache.activemq.api.core.management.ManagementHelper;
-import org.apache.activemq.core.server.cluster.impl.ClusterConnectionBridge;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.management.ManagementHelper;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionBridge;
 import org.junit.Test;
 
 public class ClusterConnectionBridgeTest extends UnitTestCase
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java
similarity index 86%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java
index bd721fb289..11363a2d1e 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.server.cluster.impl;
+package org.apache.activemq.artemis.tests.unit.core.server.cluster.impl;
 
+import org.apache.activemq.artemis.tests.unit.core.postoffice.impl.FakeQueue;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.cluster.impl.RemoteQueueBindingImpl;
-import org.apache.activemq.tests.unit.core.postoffice.impl.FakeQueue;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.cluster.impl.RemoteQueueBindingImpl;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class RemoteQueueBindImplTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java
similarity index 88%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java
index d65fdd4d7d..ba5d738747 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.server.group.impl;
+package org.apache.activemq.artemis.tests.unit.core.server.group.impl;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
 
 public class SystemPropertyOverrideTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/FileLockTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java
similarity index 87%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/FileLockTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java
index 7d9d0d3bc2..80c45dee37 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/FileLockTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.server.impl;
+package org.apache.activemq.artemis.tests.unit.core.server.impl;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Before;
 
 import org.junit.Test;
 
 import java.io.File;
 
-import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
-import org.apache.activemq.core.server.impl.AIOFileLockNodeManager;
-import org.apache.activemq.core.server.impl.FileLockNodeManager;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
+import org.apache.activemq.artemis.core.server.impl.AIOFileLockNodeManager;
+import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager;
 
 public class FileLockTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/QueueImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
similarity index 95%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/QueueImplTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
index 3be1f611ad..5dc4cff664 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/QueueImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.server.impl;
+package org.apache.activemq.artemis.tests.unit.core.server.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -25,30 +25,30 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.filter.impl.FilterImpl;
-import org.apache.activemq.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.core.server.Consumer;
-import org.apache.activemq.core.server.HandleStatus;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.core.server.MessageReference;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.QueueImpl;
-import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakeConsumer;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakeFilter;
-import org.apache.activemq.tests.unit.core.server.impl.fakes.FakePostOffice;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.FutureLatch;
-import org.apache.activemq.utils.LinkedListIterator;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeConsumer;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeFilter;
+import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.filter.impl.FilterImpl;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.server.Consumer;
+import org.apache.activemq.artemis.core.server.HandleStatus;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.utils.FutureLatch;
+import org.apache.activemq.artemis.utils.LinkedListIterator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeConsumer.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeConsumer.java
similarity index 92%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeConsumer.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeConsumer.java
index 8d6322057a..770efcaff2 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeConsumer.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeConsumer.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.server.impl.fakes;
+package org.apache.activemq.artemis.tests.unit.core.server.impl.fakes;
 
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.server.Consumer;
-import org.apache.activemq.core.server.HandleStatus;
-import org.apache.activemq.core.server.MessageReference;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.server.Consumer;
+import org.apache.activemq.artemis.core.server.HandleStatus;
+import org.apache.activemq.artemis.core.server.MessageReference;
 
 public class FakeConsumer implements Consumer
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeFilter.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeFilter.java
similarity index 86%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeFilter.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeFilter.java
index 495b573816..ead8738ec9 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeFilter.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeFilter.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.server.impl.fakes;
+package org.apache.activemq.artemis.tests.unit.core.server.impl.fakes;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.server.ServerMessage;
 
 public class FakeFilter implements Filter
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeJournalLoader.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeJournalLoader.java
similarity index 72%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeJournalLoader.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeJournalLoader.java
index 528147cfc7..251534351a 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeJournalLoader.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeJournalLoader.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.server.impl.fakes;
+package org.apache.activemq.artemis.tests.unit.core.server.impl.fakes;
 
 import javax.transaction.xa.Xid;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.api.core.Pair;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.journal.Journal;
-import org.apache.activemq.core.persistence.GroupingInfo;
-import org.apache.activemq.core.persistence.QueueBindingInfo;
-import org.apache.activemq.core.persistence.impl.PageCountPending;
-import org.apache.activemq.core.persistence.impl.journal.AddMessageRecord;
-import org.apache.activemq.core.server.MessageReference;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.JournalLoader;
-import org.apache.activemq.core.transaction.ResourceManager;
-import org.apache.activemq.core.transaction.Transaction;
+import org.apache.activemq.artemis.api.core.Pair;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.journal.Journal;
+import org.apache.activemq.artemis.core.persistence.GroupingInfo;
+import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
+import org.apache.activemq.artemis.core.persistence.impl.PageCountPending;
+import org.apache.activemq.artemis.core.persistence.impl.journal.AddMessageRecord;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.JournalLoader;
+import org.apache.activemq.artemis.core.transaction.ResourceManager;
+import org.apache.activemq.artemis.core.transaction.Transaction;
 
 public class FakeJournalLoader implements JournalLoader
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakePostOffice.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
similarity index 78%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakePostOffice.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
index 401d958433..90ffeaa714 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakePostOffice.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
@@ -14,26 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.server.impl.fakes;
+package org.apache.activemq.artemis.tests.unit.core.server.impl.fakes;
 
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq.api.core.Pair;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.persistence.impl.nullpm.NullStorageManager;
-import org.apache.activemq.core.postoffice.Binding;
-import org.apache.activemq.core.postoffice.Bindings;
-import org.apache.activemq.core.postoffice.DuplicateIDCache;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.postoffice.impl.DuplicateIDCacheImpl;
-import org.apache.activemq.core.server.MessageReference;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.QueueCreator;
-import org.apache.activemq.core.server.RoutingContext;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.impl.MessageReferenceImpl;
-import org.apache.activemq.core.transaction.Transaction;
+import org.apache.activemq.artemis.api.core.Pair;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.Bindings;
+import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.postoffice.impl.DuplicateIDCacheImpl;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.QueueCreator;
+import org.apache.activemq.artemis.core.server.RoutingContext;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.MessageReferenceImpl;
+import org.apache.activemq.artemis.core.transaction.Transaction;
 
 public class FakePostOffice implements PostOffice
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeQueueFactory.java
similarity index 82%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeQueueFactory.java
index 2b198c2d0d..145f4b279d 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeQueueFactory.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.core.server.impl.fakes;
+package org.apache.activemq.artemis.tests.unit.core.server.impl.fakes;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.filter.Filter;
-import org.apache.activemq.core.paging.cursor.PageSubscription;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.QueueFactory;
-import org.apache.activemq.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.filter.Filter;
+import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.QueueFactory;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
 
 public class FakeQueueFactory implements QueueFactory
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/ActiveMQDestinationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java
similarity index 94%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/ActiveMQDestinationTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java
index 96174f0fe3..0f6089774d 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/ActiveMQDestinationTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.jms;
+package org.apache.activemq.artemis.tests.unit.jms;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import javax.jms.JMSRuntimeException;
@@ -24,9 +25,8 @@ import javax.jms.Topic;
 
 import org.junit.Assert;
 
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class ActiveMQDestinationTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/ActiveMQMapMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java
similarity index 98%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/ActiveMQMapMessageTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java
index a02a4ea4f1..ee8f0a87ed 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/ActiveMQMapMessageTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.jms.client;
+package org.apache.activemq.artemis.tests.unit.jms.client;
 import javax.jms.MessageFormatException;
 
-import org.apache.activemq.jms.client.ActiveMQMapMessage;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.jms.client.ActiveMQMapMessage;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/ActiveMQStreamMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java
similarity index 99%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/ActiveMQStreamMessageTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java
index b0468b6169..76e4fda51b 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/ActiveMQStreamMessageTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.jms.client;
+package org.apache.activemq.artemis.tests.unit.jms.client;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -25,9 +26,8 @@ import javax.jms.MessageFormatException;
 
 import org.junit.Assert;
 
-import org.apache.activemq.jms.client.ActiveMQStreamMessage;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.jms.client.ActiveMQStreamMessage;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class ActiveMQStreamMessageTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/JMSExceptionHelperTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java
similarity index 85%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/JMSExceptionHelperTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java
index bd9580a98a..d4a22f20c1 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/JMSExceptionHelperTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.jms.client;
+package org.apache.activemq.artemis.tests.unit.jms.client;
 
-import static org.apache.activemq.api.core.ActiveMQExceptionType.CONNECTION_TIMEDOUT;
-import static org.apache.activemq.api.core.ActiveMQExceptionType.GENERIC_EXCEPTION;
-import static org.apache.activemq.api.core.ActiveMQExceptionType.INVALID_FILTER_EXPRESSION;
+import static org.apache.activemq.artemis.api.core.ActiveMQExceptionType.CONNECTION_TIMEDOUT;
+import static org.apache.activemq.artemis.api.core.ActiveMQExceptionType.GENERIC_EXCEPTION;
+import static org.apache.activemq.artemis.api.core.ActiveMQExceptionType.INVALID_FILTER_EXPRESSION;
 
 import javax.jms.IllegalStateException;
 import javax.jms.InvalidDestinationException;
@@ -26,10 +26,10 @@ import javax.jms.InvalidSelectorException;
 import javax.jms.JMSException;
 import javax.jms.JMSSecurityException;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.jms.client.JMSExceptionHelper;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.jms.client.JMSExceptionHelper;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/SelectorTranslatorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java
similarity index 98%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/SelectorTranslatorTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java
index e5020b28e5..ca931e67bd 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/client/SelectorTranslatorTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.jms.client;
+package org.apache.activemq.artemis.tests.unit.jms.client;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.jms.client.SelectorTranslator;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.jms.client.SelectorTranslator;
 
 public class SelectorTranslatorTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/misc/ManifestTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java
similarity index 87%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/misc/ManifestTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java
index f1e878ae0a..559a96d902 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/misc/ManifestTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.jms.misc;
+package org.apache.activemq.artemis.tests.unit.jms.misc;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.io.File;
@@ -29,11 +30,10 @@ import javax.jms.ConnectionMetaData;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
-import org.apache.activemq.jms.client.ActiveMQConnectionMetaData;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionMetaData;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
 
 public class ManifestTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java
similarity index 94%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java
index 33d8c5ce2c..9884c7e54a 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.jms.referenceable;
+package org.apache.activemq.artemis.tests.unit.jms.referenceable;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
-import org.apache.activemq.tests.util.UnitTestCase;
-
 public class ConnectionFactoryObjectFactoryTest extends UnitTestCase
 {
    // Constants -----------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java
similarity index 84%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java
index f52d48b572..9b79d8414d 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.jms.referenceable;
+package org.apache.activemq.artemis.tests.unit.jms.referenceable;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import javax.naming.Reference;
 
 import org.junit.Assert;
 
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.referenceable.DestinationObjectFactory;
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.referenceable.DestinationObjectFactory;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
 
 public class DestinationObjectFactoryTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
similarity index 97%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
index dd10616b39..1aa4168f66 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.ra;
+package org.apache.activemq.artemis.tests.unit.ra;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -24,8 +24,8 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -45,11 +45,11 @@ public class ActiveMQResourceAdapterConfigTest extends UnitTestCase
       "\n" +
       "         \n" +
       "            The transport type. Multiple connectors can be configured by using a comma separated list,\n" +
-      "            i.e. org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory.\n" +
+      "            i.e. org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory.\n" +
       "         \n" +
       "         ConnectorClassName\n" +
       "         java.lang.String\n" +
-      "         org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory\n" +
+      "         org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory\n" +
       "      \n" +
       "      \n" +
       "         The transport configuration. These values must be in the form of key=val;key=val;,\n" +
@@ -287,7 +287,7 @@ public class ActiveMQResourceAdapterConfigTest extends UnitTestCase
       "      \n" +
       "         Add a new managed connection factory\n" +
       "         ManagedConnectionFactory\n" +
-      "         org.apache.activemq.ra.ActiveMQRAManagedConnectionFactory\n" +
+      "         org.apache.activemq.artemis.ra.ActiveMQRAManagedConnectionFactory\n" +
       "         \n" +
       "      " +
       "      \n" +
@@ -300,7 +300,7 @@ public class ActiveMQResourceAdapterConfigTest extends UnitTestCase
       "         The class definition (full qualified name and its properties) used to encrypt the password\n" +
       "         PasswordCodec\n" +
       "         java.lang.String\n" +
-      "         org.apache.activemq.utils.DefaultSensitiveStringCodec;key=clusterpassword;algorithm=ssss\n" +
+      "         org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec;key=clusterpassword;algorithm=ssss\n" +
       "      " +
       "      " +
       "         Whether the resource adapter must use auto recovery\n" +
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/BootstrapContext.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/BootstrapContext.java
similarity index 98%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/BootstrapContext.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/BootstrapContext.java
index 84a2d408ba..1865b291ba 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/BootstrapContext.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/BootstrapContext.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.ra;
+package org.apache.activemq.artemis.tests.unit.ra;
 
 import javax.resource.spi.UnavailableException;
 import javax.resource.spi.XATerminator;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ConnectionFactoryPropertiesTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java
similarity index 94%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ConnectionFactoryPropertiesTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java
index 481d96960c..a90d09f78b 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ConnectionFactoryPropertiesTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.ra;
+package org.apache.activemq.artemis.tests.unit.ra;
 
 import java.beans.PropertyDescriptor;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
 import org.junit.Test;
 
 import static java.beans.Introspector.getBeanInfo;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/MessageEndpointFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/MessageEndpointFactory.java
similarity index 96%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/MessageEndpointFactory.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/MessageEndpointFactory.java
index adeb84f792..dbfc3cc6e4 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/MessageEndpointFactory.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/MessageEndpointFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.ra;
+package org.apache.activemq.artemis.tests.unit.ra;
 
 import javax.resource.spi.UnavailableException;
 import javax.resource.spi.endpoint.MessageEndpoint;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ResourceAdapterTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
similarity index 95%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ResourceAdapterTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
index 21756620fc..4be356bc15 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ResourceAdapterTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
@@ -14,32 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.ra;
+package org.apache.activemq.artemis.tests.unit.ra;
 
 import javax.jms.Connection;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.UDPBroadcastEndpointFactory;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.ra.ConnectionFactoryProperties;
-import org.apache.activemq.ra.ActiveMQRAManagedConnectionFactory;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.ra.inflow.ActiveMQActivation;
-import org.apache.activemq.ra.inflow.ActiveMQActivationSpec;
-import org.apache.activemq.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.ra.ConnectionFactoryProperties;
+import org.apache.activemq.artemis.ra.ActiveMQRAManagedConnectionFactory;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivation;
+import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -471,7 +471,7 @@ public class ResourceAdapterTest extends ServiceTestBase
          ra.setConnectorClassName(INVM_CONNECTOR_FACTORY);
          ra.setUserName("userGlobal");
          ra.setPassword("passwordGlobal");
-         ra.start(new org.apache.activemq.tests.unit.ra.BootstrapContext());
+         ra.start(new BootstrapContext());
 
          Connection conn = ra.getDefaultActiveMQConnectionFactory().createConnection();
 
@@ -525,7 +525,7 @@ public class ResourceAdapterTest extends ServiceTestBase
          ra.setConnectorClassName(INVM_CONNECTOR_FACTORY);
          ra.setUserName("badUser");
          ra.setPassword("badPassword");
-         ra.start(new org.apache.activemq.tests.unit.ra.BootstrapContext());
+         ra.start(new BootstrapContext());
 
          ActiveMQActivationSpec spec = new ActiveMQActivationSpec();
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ActiveMQBufferInputStreamTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java
similarity index 85%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ActiveMQBufferInputStreamTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java
index 5144cd7434..cf42ed4d3b 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ActiveMQBufferInputStreamTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.ActiveMQBufferInputStream;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream;
 import org.junit.Test;
 
 public class ActiveMQBufferInputStreamTest extends UnitTestCase
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/FakePagingManager.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java
similarity index 81%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/FakePagingManager.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java
index 9d305bae12..e12e99ce44 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/FakePagingManager.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.paging.PageTransactionInfo;
-import org.apache.activemq.core.paging.PagingManager;
-import org.apache.activemq.core.paging.PagingStore;
-import org.apache.activemq.core.postoffice.PostOffice;
-import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.paging.PageTransactionInfo;
+import org.apache.activemq.artemis.core.paging.PagingManager;
+import org.apache.activemq.artemis.core.paging.PagingStore;
+import org.apache.activemq.artemis.core.postoffice.PostOffice;
+import org.apache.activemq.artemis.core.server.ServerMessage;
 
 public final class FakePagingManager implements PagingManager
 {
@@ -141,7 +141,7 @@ public final class FakePagingManager implements PagingManager
 
    /*
     * (non-Javadoc)
-    * @see org.apache.activemq.core.paging.PagingManager#isGlobalFull()
+    * @see org.apache.activemq.artemis.core.paging.PagingManager#isGlobalFull()
     */
    public boolean isGlobalFull()
    {
@@ -150,7 +150,7 @@ public final class FakePagingManager implements PagingManager
 
    /*
     * (non-Javadoc)
-    * @see org.apache.activemq.core.paging.PagingManager#getTransactions()
+    * @see org.apache.activemq.artemis.core.paging.PagingManager#getTransactions()
     */
    public Map getTransactions()
    {
@@ -159,7 +159,7 @@ public final class FakePagingManager implements PagingManager
 
    /*
     * (non-Javadoc)
-    * @see org.apache.activemq.core.paging.PagingManager#processReload()
+    * @see org.apache.activemq.artemis.core.paging.PagingManager#processReload()
     */
    public void processReload()
    {
@@ -177,7 +177,7 @@ public final class FakePagingManager implements PagingManager
 
    /*
     * (non-Javadoc)
-    * @see org.apache.activemq.core.settings.HierarchicalRepositoryChangeListener#onChange()
+    * @see org.apache.activemq.artemis.core.settings.HierarchicalRepositoryChangeListener#onChange()
     */
    public void onChange()
    {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMContext.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMContext.java
similarity index 98%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMContext.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMContext.java
index 4decdf05d2..38c8f01afd 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMContext.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMContext.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -37,7 +37,7 @@ import javax.naming.NamingException;
 import javax.naming.RefAddr;
 import javax.naming.Reference;
 
-import org.apache.activemq.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
 
 public class InVMContext implements Context, Serializable
 {
@@ -270,7 +270,7 @@ public class InVMContext implements Context, Serializable
    public Hashtable getEnvironment() throws NamingException
    {
       Hashtable env = new Hashtable();
-      env.put("java.naming.factory.initial", "org.apache.activemq.jms.tests.tools.container.InVMInitialContextFactory");
+      env.put("java.naming.factory.initial", "org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory");
       return env;
    }
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMNameParser.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNameParser.java
similarity index 97%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMNameParser.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNameParser.java
index 99d6065660..aa9c9cb7aa 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMNameParser.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNameParser.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
 import java.io.Serializable;
 import java.util.Properties;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMNamingContext.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNamingContext.java
similarity index 98%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMNamingContext.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNamingContext.java
index 50740a57f5..687fb044be 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/InVMNamingContext.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNamingContext.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -37,7 +37,7 @@ import javax.naming.NamingException;
 import javax.naming.RefAddr;
 import javax.naming.Reference;
 
-import org.apache.activemq.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
 
 public class InVMNamingContext implements Context, Serializable
 {
@@ -270,7 +270,7 @@ public class InVMNamingContext implements Context, Serializable
    public Hashtable getEnvironment() throws NamingException
    {
       Hashtable env = new Hashtable();
-      env.put("java.naming.factory.initial", "org.apache.activemq.jms.tests.tools.container.InVMInitialContextFactory");
+      env.put("java.naming.factory.initial", "org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory");
       return env;
    }
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/LinkedListTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java
similarity index 99%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/LinkedListTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java
index 8232183105..ee4e62ec32 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/LinkedListTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
 import java.lang.ref.WeakReference;
 import java.util.LinkedList;
@@ -22,9 +22,9 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.LinkedListImpl;
-import org.apache.activemq.utils.LinkedListIterator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.LinkedListImpl;
+import org.apache.activemq.artemis.utils.LinkedListIterator;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -72,7 +72,7 @@ public class LinkedListTest extends UnitTestCase
 
       LinkedListIterator iter = objs.iterator();
 
-      for (int i = 0; i < 1000; i++)
+      for (int i = 0; i < 5000; i++)
       {
 
          for (int add = 0; add < 1000; add++)
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/MemorySizeTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/MemorySizeTest.java
similarity index 82%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/MemorySizeTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/MemorySizeTest.java
index 6ec18a3e3f..414518bbed 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/MemorySizeTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/MemorySizeTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
 import org.junit.Test;
 
 import org.junit.Assert;
 
-import org.apache.activemq.core.server.impl.MessageReferenceImpl;
-import org.apache.activemq.core.server.impl.ServerMessageImpl;
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.utils.MemorySize;
+import org.apache.activemq.artemis.core.server.impl.MessageReferenceImpl;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.utils.MemorySize;
 
 public class MemorySizeTest extends Assert
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/NonSerializableFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/NonSerializableFactory.java
similarity index 98%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/NonSerializableFactory.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/NonSerializableFactory.java
index d25a562bf2..80a296538f 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/NonSerializableFactory.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/NonSerializableFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
 import javax.naming.Context;
 import javax.naming.Name;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java
similarity index 95%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java
index 269774a522..3a41831d6c 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
@@ -37,8 +38,7 @@ import java.util.StringTokenizer;
 
 import org.junit.Assert;
 
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.ObjectInputStreamWithClassLoader;
+import org.apache.activemq.artemis.utils.ObjectInputStreamWithClassLoader;
 
 public class ObjectInputStreamWithClassLoaderTest extends UnitTestCase
 {
@@ -96,7 +96,7 @@ public class ObjectInputStreamWithClassLoaderTest extends UnitTestCase
          Thread.currentThread().setContextClassLoader(testClassLoader);
 
          ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-         org.apache.activemq.utils.ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(bais);
+         ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(bais);
 
          Object deserializedObj = ois.readObject();
 
@@ -132,7 +132,7 @@ public class ObjectInputStreamWithClassLoaderTest extends UnitTestCase
                .newClassLoader(this.getClass());
          Thread.currentThread().setContextClassLoader(testClassLoader);
          ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-         org.apache.activemq.utils.ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(
+         ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(
                bais);
 
          Runnable toRun = (Runnable) testClassLoader.loadClass(
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ReusableLatchTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java
similarity index 97%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ReusableLatchTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java
index 2cb154554c..42893cef22 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/ReusableLatchTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.activemq.tests.unit.UnitTestLogger;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.ReusableLatch;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.ReusableLatch;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/SoftValueMapTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java
similarity index 96%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/SoftValueMapTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java
index 0714a1ca3b..285345e530 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/SoftValueMapTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.SoftValueHashMap;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.SoftValueHashMap;
 import org.junit.Test;
 
 public class SoftValueMapTest extends UnitTestCase
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UTF8Test.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java
similarity index 91%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UTF8Test.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java
index 2a8d549ed0..5d6f84d7f3 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UTF8Test.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQBuffers;
+package org.apache.activemq.artemis.tests.unit.util;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.After;
 
 import org.junit.Test;
@@ -29,11 +30,10 @@ import java.nio.ByteBuffer;
 
 import org.junit.Assert;
 
-import org.apache.activemq.tests.util.RandomUtil;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.DataConstants;
-import org.apache.activemq.utils.Random;
-import org.apache.activemq.utils.UTF8Util;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.utils.DataConstants;
+import org.apache.activemq.artemis.utils.Random;
+import org.apache.activemq.artemis.utils.UTF8Util;
 
 public class UTF8Test extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UUIDGeneratorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java
similarity index 94%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UUIDGeneratorTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java
index 32749773b5..1d7a8856ce 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UUIDGeneratorTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UUIDTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java
similarity index 90%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UUIDTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java
index 36a501140b..897d913437 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/UUIDTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.junit.Test;
 
 import java.util.HashSet;
@@ -23,9 +24,8 @@ import java.util.Set;
 
 import org.junit.Assert;
 
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.UUID;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.utils.UUID;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 public class UUIDTest extends UnitTestCase
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/VersionLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java
similarity index 92%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/VersionLoaderTest.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java
index c58c8bef9a..829b516117 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/util/VersionLoaderTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.unit.util;
+package org.apache.activemq.artemis.tests.unit.util;
 
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import org.apache.activemq.core.version.Version;
-import org.apache.activemq.tests.util.UnitTestCase;
-import org.apache.activemq.utils.VersionLoader;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
+import org.apache.activemq.artemis.core.version.Version;
+import org.apache.activemq.artemis.utils.VersionLoader;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/util/CreateMessage.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/CreateMessage.java
similarity index 88%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/util/CreateMessage.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/CreateMessage.java
index e2a56301da..429c8fbc97 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/util/CreateMessage.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/CreateMessage.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.util;
+package org.apache.activemq.artemis.tests.util;
 
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.jms.client.ActiveMQBytesMessage;
-import org.apache.activemq.jms.client.ActiveMQTextMessage;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.jms.client.ActiveMQBytesMessage;
+import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
 
 public final class CreateMessage
 {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/util/SpawnedVMSupport.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java
similarity index 98%
rename from tests/unit-tests/src/test/java/org/apache/activemq/tests/util/SpawnedVMSupport.java
rename to tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java
index a3e336e24e..418fe5c90a 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/util/SpawnedVMSupport.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.tests.util;
+package org.apache.activemq.artemis.tests.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -28,7 +28,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.activemq.tests.unit.UnitTestLogger;
+import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
 import org.junit.Assert;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
diff --git a/tests/unit-tests/src/test/resources/beans1.xml b/tests/unit-tests/src/test/resources/beans1.xml
index c95e355aee..b7ef164d44 100644
--- a/tests/unit-tests/src/test/resources/beans1.xml
+++ b/tests/unit-tests/src/test/resources/beans1.xml
@@ -16,5 +16,5 @@
   limitations under the License.
 -->
 
-   
+   
 
\ No newline at end of file