From f509c075c66a29f112737f3273890bfbc098985f Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Mon, 27 Apr 2015 16:40:36 -0400 Subject: [PATCH] ACTIVEMQ6-1 Artemis rename This commit is a simple mv of the files.. We required two commits to preserve history, one to git mv, one for the actual changes... otherwise history would be lost Based on the Apache ActiveMQ community vote this project is being renamed "Artemis." --- {activemq-boot => artemis-boot}/pom.xml | 0 .../org/apache/activemq/artemis}/boot/ActiveMQ.java | 0 {activemq-bootstrap => artemis-bootstrap}/pom.xml | 0 .../org/apache/activemq/artemis}/cli/banner.txt | 0 .../org/apache/activemq/artemis}/cli/ActiveMQ.java | 0 .../artemis}/cli/ConfigurationException.java | 0 .../activemq/artemis}/cli/commands/Action.java | 0 .../artemis}/cli/commands/ActionContext.java | 0 .../activemq/artemis}/cli/commands/Create.java | 0 .../activemq/artemis}/cli/commands/HelpAction.java | 0 .../apache/activemq/artemis}/cli/commands/Run.java | 0 .../apache/activemq/artemis}/cli/commands/Stop.java | 0 .../artemis}/components/ExternalComponent.java | 0 .../artemis}/factory/BasicSecurityHandler.java | 0 .../activemq/artemis}/factory/BrokerFactory.java | 0 .../artemis}/factory/BrokerFactoryHandler.java | 0 .../activemq/artemis}/factory/BrokerHandler.java | 0 .../artemis}/factory/FileBrokerHandler.java | 0 .../activemq/artemis}/factory/SecurityHandler.java | 0 .../artemis}/factory/SecurityManagerFactory.java | 0 .../artemis}/factory/XmlBrokerFactoryHandler.java | 0 .../activemq/artemis}/integration/Broker.java | 0 .../activemq/artemis}/integration/FileBroker.java | 0 .../bootstrap/ActiveMQBootstrapBundle.java | 0 .../bootstrap/ActiveMQBootstrapLogger.java | 0 .../artemis}/broker/security/basic-security | 0 .../org/apache/activemq/artemis}/broker/server/file | 0 .../org/apache/activemq/artemis}/broker/xml | 0 .../activemq/artemis}/cli/commands/bin/activemq | 0 .../artemis}/cli/commands/bin/activemq-service | 0 .../artemis}/cli/commands/bin/activemq-service.xml | 0 .../activemq/artemis}/cli/commands/bin/activemq.cmd | 0 .../cli/commands/etc/activemq-configuration.xml | 0 .../cli/commands/etc/activemq-roles.properties | 0 .../cli/commands/etc/activemq-users.properties | 0 .../artemis}/cli/commands/etc/activemq.profile | 0 .../artemis}/cli/commands/etc/activemq.profile.cmd | 0 .../artemis}/cli/commands/etc/bootstrap.xml | 0 .../artemis}/cli/commands/etc/cluster-settings.txt | 0 .../artemis}/cli/commands/etc/logging.properties | 0 .../cli/commands/etc/replicated-settings.txt | 0 .../cli/commands/etc/shared-store-settings.txt | 0 .../activemq/artemis}/test/FileBrokerTest.java | 0 .../test/resources/activemq-configuration-nojms.xml | 0 .../src/test/resources/activemq-configuration.xml | 0 {activemq-commons => artemis-commons}/pom.xml | 0 .../src/main/appended-resources/META-INF/LICENSE | 0 .../api/core/ActiveMQAddressExistsException.java | 0 .../api/core/ActiveMQAddressFullException.java | 0 .../core/ActiveMQAlreadyReplicatingException.java | 0 .../activemq/artemis}/api/core/ActiveMQBuffer.java | 0 .../activemq/artemis}/api/core/ActiveMQBuffers.java | 0 .../api/core/ActiveMQClusterSecurityException.java | 0 .../core/ActiveMQConnectionTimedOutException.java | 0 .../api/core/ActiveMQDisconnectedException.java | 0 .../api/core/ActiveMQDuplicateIdException.java | 0 .../core/ActiveMQDuplicateMetaDataException.java | 0 .../artemis}/api/core/ActiveMQException.java | 0 .../artemis}/api/core/ActiveMQExceptionType.java | 0 .../artemis}/api/core/ActiveMQIOErrorException.java | 0 .../api/core/ActiveMQIllegalStateException.java | 0 .../ActiveMQIncompatibleClientServerException.java | 0 .../ActiveMQInterceptorRejectedPacketException.java | 0 .../api/core/ActiveMQInternalErrorException.java | 0 .../api/core/ActiveMQInterruptedException.java | 0 .../ActiveMQInvalidFilterExpressionException.java | 0 .../ActiveMQInvalidTransientQueueUseException.java | 0 .../api/core/ActiveMQLargeMessageException.java | 0 .../ActiveMQLargeMessageInterruptedException.java | 0 .../artemis}/api/core/ActiveMQNativeIOError.java | 0 .../api/core/ActiveMQNonExistentQueueException.java | 0 .../api/core/ActiveMQNotConnectedException.java | 0 .../api/core/ActiveMQObjectClosedException.java | 0 .../core/ActiveMQPropertyConversionException.java | 0 .../api/core/ActiveMQQueueExistsException.java | 0 .../api/core/ActiveMQSecurityException.java | 0 .../api/core/ActiveMQSessionCreationException.java | 0 .../ActiveMQTransactionOutcomeUnknownException.java | 0 .../ActiveMQTransactionRolledBackException.java | 0 .../api/core/ActiveMQUnBlockedException.java | 0 .../core/ActiveMQUnsupportedPacketException.java | 0 .../org/apache/activemq/artemis}/api/core/Pair.java | 0 .../activemq/artemis}/api/core/SimpleString.java | 0 .../core/buffers/impl/ChannelBufferWrapper.java | 0 .../artemis}/core/server/ActiveMQComponent.java | 0 .../activemq/artemis}/logs/ActiveMQUtilBundle.java | 0 .../activemq/artemis}/logs/ActiveMQUtilLogger.java | 0 .../artemis}/logs/AssertionLoggerHandler.java | 0 .../artemis}/utils/ActiveMQThreadFactory.java | 0 .../org/apache/activemq/artemis}/utils/Base64.java | 0 .../apache/activemq/artemis}/utils/ByteUtil.java | 0 .../activemq/artemis}/utils/ClassloadingUtil.java | 0 .../activemq/artemis}/utils/ConcurrentHashSet.java | 0 .../activemq/artemis}/utils/ConcurrentSet.java | 0 .../activemq/artemis}/utils/DataConstants.java | 0 .../artemis}/utils/DefaultSensitiveStringCodec.java | 0 .../activemq/artemis}/utils/FactoryFinder.java | 0 .../artemis}/utils/PasswordMaskingUtil.java | 0 .../activemq/artemis}/utils/ReferenceCounter.java | 0 .../artemis}/utils/ReferenceCounterUtil.java | 0 .../activemq/artemis}/utils/ReusableLatch.java | 0 .../activemq/artemis}/utils/SensitiveDataCodec.java | 0 .../activemq/artemis}/utils/TypedProperties.java | 0 .../apache/activemq/artemis}/utils/UTF8Util.java | 0 .../org/apache/activemq/artemis}/utils/UUID.java | 0 .../activemq/artemis}/utils/UUIDGenerator.java | 0 .../apache/activemq/artemis}/utils/UUIDTimer.java | 0 .../artemis}/utils/uri/SchemaConstants.java | 0 .../activemq/artemis}/utils/uri/URIFactory.java | 0 .../activemq/artemis}/utils/uri/URISchema.java | 0 .../activemq/artemis}/utils/ByteUtilTest.java | 0 .../apache/activemq/artemis}/utils/PairTest.java | 0 .../artemis}/utils/ReferenceCounterTest.java | 0 .../activemq/artemis}/utils/URIParserTest.java | 0 .../pom.xml | 0 .../src/main/appended-resources/META-INF/LICENSE | 0 .../api/config/ActiveMQDefaultConfiguration.java | 0 .../activemq/artemis}/api/core/BaseInterceptor.java | 0 .../artemis}/api/core/BroadcastEndpoint.java | 0 .../artemis}/api/core/BroadcastEndpointFactory.java | 0 .../api/core/BroadcastGroupConfiguration.java | 0 .../api/core/ChannelBroadcastEndpointFactory.java | 0 .../api/core/DiscoveryGroupConfiguration.java | 0 .../activemq/artemis}/api/core/FilterConstants.java | 0 .../activemq/artemis}/api/core/Interceptor.java | 0 .../artemis}/api/core/JGroupsBroadcastEndpoint.java | 0 .../api/core/JGroupsChannelBroadcastEndpoint.java | 0 .../api/core/JGroupsFileBroadcastEndpoint.java | 0 .../core/JGroupsFileBroadcastEndpointFactory.java | 0 .../core/JGroupsPropertiesBroadcastEndpoint.java | 0 .../JGroupsPropertiesBroadcastEndpointFactory.java | 0 .../apache/activemq/artemis}/api/core/Message.java | 0 .../artemis}/api/core/TransportConfiguration.java | 0 .../api/core/TransportConfigurationHelper.java | 0 .../api/core/UDPBroadcastEndpointFactory.java | 0 .../artemis}/api/core/client/ActiveMQClient.java | 0 .../artemis}/api/core/client/ClientConsumer.java | 0 .../artemis}/api/core/client/ClientMessage.java | 0 .../artemis}/api/core/client/ClientProducer.java | 0 .../artemis}/api/core/client/ClientRequestor.java | 0 .../artemis}/api/core/client/ClientSession.java | 0 .../api/core/client/ClientSessionFactory.java | 0 .../api/core/client/ClusterTopologyListener.java | 0 .../api/core/client/FailoverEventListener.java | 0 .../artemis}/api/core/client/FailoverEventType.java | 0 .../artemis}/api/core/client/MessageHandler.java | 0 .../api/core/client/SendAcknowledgementHandler.java | 0 .../artemis}/api/core/client/ServerLocator.java | 0 .../api/core/client/SessionFailureListener.java | 0 .../artemis}/api/core/client/TopologyMember.java | 0 .../loadbalance/ConnectionLoadBalancingPolicy.java | 0 .../FirstElementConnectionLoadBalancingPolicy.java | 0 .../RandomConnectionLoadBalancingPolicy.java | 0 .../RandomStickyConnectionLoadBalancingPolicy.java | 0 .../RoundRobinConnectionLoadBalancingPolicy.java | 0 .../api/core/client/loadbalance/package-info.java | 0 .../artemis}/api/core/client/package-info.java | 0 .../api/core/management/AcceptorControl.java | 0 .../core/management/ActiveMQComponentControl.java | 0 .../api/core/management/ActiveMQServerControl.java | 0 .../api/core/management/AddressControl.java | 0 .../api/core/management/AddressSettingsInfo.java | 0 .../artemis}/api/core/management/BridgeControl.java | 0 .../api/core/management/BroadcastGroupControl.java | 0 .../core/management/ClusterConnectionControl.java | 0 .../api/core/management/CoreNotificationType.java | 0 .../api/core/management/DayCounterInfo.java | 0 .../artemis}/api/core/management/DivertControl.java | 0 .../api/core/management/ManagementHelper.java | 0 .../api/core/management/NotificationType.java | 0 .../api/core/management/ObjectNameBuilder.java | 0 .../artemis}/api/core/management/Operation.java | 0 .../artemis}/api/core/management/Parameter.java | 0 .../artemis}/api/core/management/QueueControl.java | 0 .../artemis}/api/core/management/ResourceNames.java | 0 .../artemis}/api/core/management/RoleInfo.java | 0 .../artemis}/api/core/management/package-info.java | 0 .../activemq/artemis}/api/core/package-info.java | 0 .../impl/ResetLimitWrappedActiveMQBuffer.java | 0 .../artemis}/core/client/ActiveMQClientLogger.java | 0 .../core/client/ActiveMQClientMessageBundle.java | 0 .../core/client/impl/ActiveMQXAResource.java | 0 .../artemis}/core/client/impl/AddressQueryImpl.java | 0 .../client/impl/AfterConnectInternalListener.java | 0 .../core/client/impl/ClientConsumerImpl.java | 0 .../core/client/impl/ClientConsumerInternal.java | 0 .../core/client/impl/ClientLargeMessageImpl.java | 0 .../client/impl/ClientLargeMessageInternal.java | 0 .../core/client/impl/ClientMessageImpl.java | 0 .../core/client/impl/ClientMessageInternal.java | 0 .../client/impl/ClientProducerCreditManager.java | 0 .../impl/ClientProducerCreditManagerImpl.java | 0 .../core/client/impl/ClientProducerCredits.java | 0 .../core/client/impl/ClientProducerCreditsImpl.java | 0 .../core/client/impl/ClientProducerImpl.java | 0 .../core/client/impl/ClientProducerInternal.java | 0 .../core/client/impl/ClientSessionFactoryImpl.java | 0 .../client/impl/ClientSessionFactoryInternal.java | 0 .../core/client/impl/ClientSessionImpl.java | 0 .../core/client/impl/ClientSessionInternal.java | 0 .../impl/CompressedLargeMessageControllerImpl.java | 0 .../core/client/impl/DelegatingSession.java | 0 .../core/client/impl/LargeMessageController.java | 0 .../client/impl/LargeMessageControllerImpl.java | 0 .../artemis}/core/client/impl/QueueQueryImpl.java | 0 .../core/client/impl/ServerLocatorImpl.java | 0 .../core/client/impl/ServerLocatorInternal.java | 0 .../artemis}/core/client/impl/Topology.java | 0 .../core/client/impl/TopologyMemberImpl.java | 0 .../artemis}/core/cluster/DiscoveryEntry.java | 0 .../artemis}/core/cluster/DiscoveryGroup.java | 0 .../artemis}/core/cluster/DiscoveryListener.java | 0 .../core/exception/ActiveMQXAException.java | 0 .../activemq/artemis}/core/message/BodyEncoder.java | 0 .../artemis}/core/message/impl/MessageImpl.java | 0 .../artemis}/core/message/impl/MessageInternal.java | 0 .../artemis}/core/protocol/ClientPacketDecoder.java | 0 .../artemis}/core/protocol/core/Channel.java | 0 .../artemis}/core/protocol/core/ChannelHandler.java | 0 .../protocol/core/CommandConfirmationHandler.java | 0 .../core/protocol/core/CoreRemotingConnection.java | 0 .../artemis}/core/protocol/core/Packet.java | 0 .../core/impl/ActiveMQClientProtocolManager.java | 0 .../impl/ActiveMQClientProtocolManagerFactory.java | 0 .../protocol/core/impl/ActiveMQConsumerContext.java | 0 .../protocol/core/impl/ActiveMQSessionContext.java | 0 .../core/impl/BackwardsCompatibilityUtils.java | 0 .../core/protocol/core/impl/ChannelImpl.java | 0 .../core/protocol/core/impl/PacketDecoder.java | 0 .../core/protocol/core/impl/PacketImpl.java | 0 .../protocol/core/impl/RemotingConnectionImpl.java | 0 .../impl/wireformat/ActiveMQExceptionMessage.java | 0 .../core/impl/wireformat/CheckFailoverMessage.java | 0 .../impl/wireformat/CheckFailoverReplyMessage.java | 0 .../wireformat/ClusterTopologyChangeMessage.java | 0 .../wireformat/ClusterTopologyChangeMessage_V2.java | 0 .../wireformat/ClusterTopologyChangeMessage_V3.java | 0 .../core/impl/wireformat/CreateQueueMessage.java | 0 .../core/impl/wireformat/CreateSessionMessage.java | 0 .../wireformat/CreateSessionResponseMessage.java | 0 .../impl/wireformat/CreateSharedQueueMessage.java | 0 .../impl/wireformat/DisconnectConsumerMessage.java | 0 .../core/impl/wireformat/DisconnectMessage.java | 0 .../core/impl/wireformat/DisconnectMessage_V2.java | 0 .../core/impl/wireformat/MessagePacket.java | 0 .../core/impl/wireformat/NullResponseMessage.java | 0 .../impl/wireformat/PacketsConfirmedMessage.java | 0 .../core/protocol/core/impl/wireformat/Ping.java | 0 .../impl/wireformat/ReattachSessionMessage.java | 0 .../wireformat/ReattachSessionResponseMessage.java | 0 .../core/impl/wireformat/RollbackMessage.java | 0 .../impl/wireformat/SessionAcknowledgeMessage.java | 0 .../impl/wireformat/SessionAddMetaDataMessage.java | 0 .../wireformat/SessionAddMetaDataMessageV2.java | 0 .../impl/wireformat/SessionBindingQueryMessage.java | 0 .../SessionBindingQueryResponseMessage.java | 0 .../SessionBindingQueryResponseMessage_V2.java | 0 .../core/impl/wireformat/SessionCloseMessage.java | 0 .../core/impl/wireformat/SessionCommitMessage.java | 0 .../wireformat/SessionConsumerCloseMessage.java | 0 .../SessionConsumerFlowCreditMessage.java | 0 .../impl/wireformat/SessionContinuationMessage.java | 0 .../wireformat/SessionCreateConsumerMessage.java | 0 .../impl/wireformat/SessionDeleteQueueMessage.java | 0 .../core/impl/wireformat/SessionExpireMessage.java | 0 .../wireformat/SessionForceConsumerDelivery.java | 0 .../SessionIndividualAcknowledgeMessage.java | 0 .../SessionProducerCreditsFailMessage.java | 0 .../wireformat/SessionProducerCreditsMessage.java | 0 .../impl/wireformat/SessionQueueQueryMessage.java | 0 .../SessionQueueQueryResponseMessage.java | 0 .../SessionQueueQueryResponseMessage_V2.java | 0 .../SessionReceiveClientLargeMessage.java | 0 .../SessionReceiveContinuationMessage.java | 0 .../impl/wireformat/SessionReceiveLargeMessage.java | 0 .../core/impl/wireformat/SessionReceiveMessage.java | 0 .../SessionRequestProducerCreditsMessage.java | 0 .../wireformat/SessionSendContinuationMessage.java | 0 .../impl/wireformat/SessionSendLargeMessage.java | 0 .../core/impl/wireformat/SessionSendMessage.java | 0 .../wireformat/SessionUniqueAddMetaDataMessage.java | 0 .../wireformat/SessionXAAfterFailedMessage.java | 0 .../impl/wireformat/SessionXACommitMessage.java | 0 .../core/impl/wireformat/SessionXAEndMessage.java | 0 .../impl/wireformat/SessionXAForgetMessage.java | 0 .../SessionXAGetInDoubtXidsResponseMessage.java | 0 .../SessionXAGetTimeoutResponseMessage.java | 0 .../core/impl/wireformat/SessionXAJoinMessage.java | 0 .../impl/wireformat/SessionXAPrepareMessage.java | 0 .../impl/wireformat/SessionXAResponseMessage.java | 0 .../impl/wireformat/SessionXAResumeMessage.java | 0 .../impl/wireformat/SessionXARollbackMessage.java | 0 .../impl/wireformat/SessionXASetTimeoutMessage.java | 0 .../SessionXASetTimeoutResponseMessage.java | 0 .../core/impl/wireformat/SessionXAStartMessage.java | 0 .../SubscribeClusterTopologyUpdatesMessage.java | 0 .../SubscribeClusterTopologyUpdatesMessageV2.java | 0 .../artemis}/core/remoting/CloseListener.java | 0 .../artemis}/core/remoting/FailureListener.java | 0 .../remoting/impl/TransportConfigurationUtil.java | 0 .../impl/netty/ActiveMQAMQPFrameDecoder.java | 0 .../remoting/impl/netty/ActiveMQChannelHandler.java | 0 .../remoting/impl/netty/ActiveMQFrameDecoder2.java | 0 .../core/remoting/impl/netty/NettyConnection.java | 0 .../core/remoting/impl/netty/NettyConnector.java | 0 .../remoting/impl/netty/NettyConnectorFactory.java | 0 .../impl/netty/PartialPooledByteBufAllocator.java | 0 .../impl/netty/SharedNioEventLoopGroup.java | 0 .../remoting/impl/netty/TransportConstants.java | 0 .../artemis}/core/remoting/impl/ssl/SSLSupport.java | 0 .../artemis}/core/remoting/package-info.java | 0 .../artemis}/core/security/ActiveMQPrincipal.java | 0 .../activemq/artemis}/core/security/Role.java | 0 .../artemis}/core/server/QueueQueryResult.java | 0 .../core/server/management/Notification.java | 0 .../server/management/NotificationListener.java | 0 .../core/server/management/NotificationService.java | 0 .../settings/impl/AddressFullMessagePolicy.java | 0 .../artemis}/core/transaction/impl/XidImpl.java | 0 .../activemq/artemis}/core/version/Version.java | 0 .../artemis}/core/version/impl/VersionImpl.java | 0 .../activemq/artemis}/reader/BytesMessageUtil.java | 0 .../activemq/artemis}/reader/MapMessageUtil.java | 0 .../activemq/artemis}/reader/MessageUtil.java | 0 .../activemq/artemis}/reader/StreamMessageUtil.java | 0 .../activemq/artemis}/reader/TextMessageUtil.java | 0 .../activemq/artemis}/reader/package-info.java | 0 .../core/protocol/AbstractRemotingConnection.java | 0 .../artemis}/spi/core/protocol/ConnectionEntry.java | 0 .../spi/core/protocol/RemotingConnection.java | 0 .../spi/core/remoting/AbstractConnector.java | 0 .../artemis}/spi/core/remoting/BufferDecoder.java | 0 .../artemis}/spi/core/remoting/BufferHandler.java | 0 .../spi/core/remoting/ClientProtocolManager.java | 0 .../core/remoting/ClientProtocolManagerFactory.java | 0 .../artemis}/spi/core/remoting/Connection.java | 0 .../core/remoting/ConnectionLifeCycleListener.java | 0 .../artemis}/spi/core/remoting/Connector.java | 0 .../spi/core/remoting/ConnectorFactory.java | 0 .../artemis}/spi/core/remoting/ConsumerContext.java | 0 .../artemis}/spi/core/remoting/ReadyListener.java | 0 .../artemis}/spi/core/remoting/SessionContext.java | 0 .../spi/core/remoting/TopologyResponseHandler.java | 0 .../artemis}/spi/core/remoting/package-info.java | 0 .../artemis}/uri/AbstractServerLocatorSchema.java | 0 .../uri/AbstractTransportConfigurationSchema.java | 0 .../activemq/artemis}/uri/ConnectionOptions.java | 0 .../uri/ConnectorTransportConfigurationParser.java | 0 .../artemis}/uri/InVMServerLocatorSchema.java | 0 .../uri/InVMTransportConfigurationSchema.java | 0 .../artemis}/uri/JGroupsServerLocatorSchema.java | 0 .../activemq/artemis}/uri/ServerLocatorParser.java | 0 .../artemis}/uri/TCPServerLocatorSchema.java | 0 .../uri/TCPTransportConfigurationSchema.java | 0 .../artemis}/uri/UDPServerLocatorSchema.java | 0 .../artemis}/utils/ActiveMQBufferInputStream.java | 0 .../activemq/artemis}/utils/BufferHelper.java | 0 .../artemis}/utils/ConfigurationHelper.java | 0 .../artemis}/utils/ConfirmationWindowWarning.java | 0 .../activemq/artemis}/utils/DeflaterReader.java | 0 .../activemq/artemis}/utils/ExecutorFactory.java | 0 .../apache/activemq/artemis}/utils/FutureLatch.java | 0 .../apache/activemq/artemis}/utils/IDGenerator.java | 0 .../activemq/artemis}/utils/InflaterReader.java | 0 .../activemq/artemis}/utils/InflaterWriter.java | 0 .../apache/activemq/artemis}/utils/JNDIUtil.java | 0 .../apache/activemq/artemis}/utils/LinkedList.java | 0 .../activemq/artemis}/utils/LinkedListImpl.java | 0 .../activemq/artemis}/utils/LinkedListIterator.java | 0 .../apache/activemq/artemis}/utils/MemorySize.java | 0 .../utils/ObjectInputStreamWithClassLoader.java | 0 .../artemis}/utils/OrderedExecutorFactory.java | 0 .../activemq/artemis}/utils/PriorityLinkedList.java | 0 .../artemis}/utils/PriorityLinkedListImpl.java | 0 .../org/apache/activemq/artemis}/utils/Random.java | 0 .../activemq/artemis}/utils/SecurityFormatter.java | 0 .../activemq/artemis}/utils/SimpleIDGenerator.java | 0 .../activemq/artemis}/utils/SizeFormatterUtil.java | 0 .../activemq/artemis}/utils/SoftValueHashMap.java | 0 .../artemis}/utils/TimeAndCounterIDGenerator.java | 0 .../activemq/artemis}/utils/TokenBucketLimiter.java | 0 .../artemis}/utils/TokenBucketLimiterImpl.java | 0 .../activemq/artemis}/utils/VersionLoader.java | 0 .../org/apache/activemq/artemis}/utils/XMLUtil.java | 0 .../activemq/artemis}/utils/XidCodecSupport.java | 0 .../activemq/artemis}/utils/json/JSONArray.java | 0 .../activemq/artemis}/utils/json/JSONException.java | 0 .../activemq/artemis}/utils/json/JSONObject.java | 0 .../activemq/artemis}/utils/json/JSONString.java | 0 .../activemq/artemis}/utils/json/JSONTokener.java | 0 .../activemq/artemis}/utils/package-info.java | 0 .../src/main/resources/activemq-version.properties | 0 .../activemq/artemis}/tests/CoreUnitTestCase.java | 0 .../activemq/artemis}/tests/util/RandomUtil.java | 0 .../artemis}/tests/util/SilentTestCase.java | 0 .../activemq/artemis}/util/CompressionUtilTest.java | 0 .../artemis}/util/ConcurrentHashSetTest.java | 0 .../util/TimeAndCounterIDGeneratorTest.java | 0 .../util/TypedPropertiesConversionTest.java | 0 .../activemq/artemis}/util/TypedPropertiesTest.java | 0 .../apache/activemq/artemis}/util/XMLUtilTest.java | 0 {activemq-dto => artemis-dto}/pom.xml | 0 .../org/apache/activemq/artemis}/dto/AppDTO.java | 0 .../activemq/artemis}/dto/BasicSecurityDTO.java | 0 .../org/apache/activemq/artemis}/dto/BrokerDTO.java | 0 .../apache/activemq/artemis}/dto/ComponentDTO.java | 0 .../apache/activemq/artemis}/dto/SecurityDTO.java | 0 .../org/apache/activemq/artemis}/dto/ServerDTO.java | 0 .../apache/activemq/artemis}/dto/WebServerDTO.java | 0 .../org/apache/activemq/artemis}/dto/XmlUtil.java | 0 .../apache/activemq/artemis}/dto/package-info.java | 0 .../org/apache/activemq/artemis}/dto/jaxb.index | 0 {activemq-jms-client => artemis-jms-client}/pom.xml | 0 .../artemis}/api/jms/ActiveMQJMSClient.java | 0 .../artemis}/api/jms/ActiveMQJMSConstants.java | 0 .../activemq/artemis}/api/jms/JMSFactoryType.java | 0 .../jms/management/ConnectionFactoryControl.java | 0 .../api/jms/management/DestinationControl.java | 0 .../api/jms/management/JMSConnectionInfo.java | 0 .../api/jms/management/JMSConsumerInfo.java | 0 .../api/jms/management/JMSManagementHelper.java | 0 .../api/jms/management/JMSQueueControl.java | 0 .../api/jms/management/JMSServerControl.java | 0 .../artemis}/api/jms/management/JMSSessionInfo.java | 0 .../api/jms/management/SubscriptionInfo.java | 0 .../artemis}/api/jms/management/TopicControl.java | 0 .../artemis}/api/jms/management/package-info.java | 0 .../activemq/artemis}/api/jms/package-info.java | 0 .../artemis}/jms/client/ActiveMQBytesMessage.java | 0 .../artemis}/jms/client/ActiveMQConnection.java | 0 .../jms/client/ActiveMQConnectionFactory.java | 0 .../jms/client/ActiveMQConnectionForContext.java | 0 .../client/ActiveMQConnectionForContextImpl.java | 0 .../jms/client/ActiveMQConnectionMetaData.java | 0 .../artemis}/jms/client/ActiveMQDestination.java | 0 .../jms/client/ActiveMQJMSClientBundle.java | 0 .../jms/client/ActiveMQJMSClientLogger.java | 0 .../jms/client/ActiveMQJMSConnectionFactory.java | 0 .../artemis}/jms/client/ActiveMQJMSConsumer.java | 0 .../artemis}/jms/client/ActiveMQJMSContext.java | 0 .../artemis}/jms/client/ActiveMQJMSProducer.java | 0 .../artemis}/jms/client/ActiveMQMapMessage.java | 0 .../artemis}/jms/client/ActiveMQMessage.java | 0 .../jms/client/ActiveMQMessageConsumer.java | 0 .../jms/client/ActiveMQMessageProducer.java | 0 .../artemis}/jms/client/ActiveMQObjectMessage.java | 0 .../activemq/artemis}/jms/client/ActiveMQQueue.java | 0 .../artemis}/jms/client/ActiveMQQueueBrowser.java | 0 .../jms/client/ActiveMQQueueConnectionFactory.java | 0 .../artemis}/jms/client/ActiveMQSession.java | 0 .../artemis}/jms/client/ActiveMQStreamMessage.java | 0 .../artemis}/jms/client/ActiveMQTemporaryQueue.java | 0 .../artemis}/jms/client/ActiveMQTemporaryTopic.java | 0 .../artemis}/jms/client/ActiveMQTextMessage.java | 0 .../activemq/artemis}/jms/client/ActiveMQTopic.java | 0 .../jms/client/ActiveMQTopicConnectionFactory.java | 0 .../artemis}/jms/client/ActiveMQXAConnection.java | 0 .../jms/client/ActiveMQXAConnectionFactory.java | 0 .../artemis}/jms/client/ActiveMQXAJMSContext.java | 0 .../client/ActiveMQXAQueueConnectionFactory.java | 0 .../artemis}/jms/client/ActiveMQXASession.java | 0 .../client/ActiveMQXATopicConnectionFactory.java | 0 .../artemis}/jms/client/JMSExceptionHelper.java | 0 .../jms/client/JMSMessageListenerWrapper.java | 0 .../artemis}/jms/client/JmsExceptionUtils.java | 0 .../artemis}/jms/client/SelectorTranslator.java | 0 .../artemis}/jms/client/ThreadAwareContext.java | 0 .../activemq/artemis}/jms/client/package-info.java | 0 .../ConnectionFactoryObjectFactory.java | 0 .../jms/referenceable/DestinationObjectFactory.java | 0 .../referenceable/SerializableObjectRefAddr.java | 0 .../jndi/ActiveMQInitialContextFactory.java | 0 .../activemq/artemis}/jndi/LazyCreateContext.java | 0 .../activemq/artemis}/jndi/NameParserImpl.java | 0 .../activemq/artemis}/jndi/ReadOnlyContext.java | 0 .../activemq/artemis}/uri/AbstractCFSchema.java | 0 .../artemis}/uri/ConnectionFactoryParser.java | 0 .../apache/activemq/artemis}/uri/InVMSchema.java | 0 .../apache/activemq/artemis}/uri/JGroupsSchema.java | 0 .../activemq/artemis}/uri/JMSConnectionOptions.java | 0 .../org/apache/activemq/artemis}/uri/TCPSchema.java | 0 .../org/apache/activemq/artemis}/uri/UDPSchema.java | 0 .../artemis}/uri/ConnectionFactoryURITest.java | 0 {activemq-jms-server => artemis-jms-server}/pom.xml | 0 .../jms/bridge/ActiveMQJMSBridgeLogger.java | 0 .../jms/bridge/ConnectionFactoryFactory.java | 0 .../artemis}/jms/bridge/DestinationFactory.java | 0 .../activemq/artemis}/jms/bridge/JMSBridge.java | 0 .../artemis}/jms/bridge/JMSBridgeControl.java | 0 .../artemis}/jms/bridge/QualityOfServiceMode.java | 0 .../jms/bridge/impl/JMSBridgeControlImpl.java | 0 .../artemis}/jms/bridge/impl/JMSBridgeImpl.java | 0 .../bridge/impl/JNDIConnectionFactoryFactory.java | 0 .../jms/bridge/impl/JNDIDestinationFactory.java | 0 .../jms/bridge/impl/JNDIFactorySupport.java | 0 .../impl/JMSConnectionFactoryControlImpl.java | 0 .../jms/management/impl/JMSQueueControlImpl.java | 0 .../jms/management/impl/JMSServerControlImpl.java | 0 .../jms/management/impl/JMSTopicControlImpl.java | 0 .../artemis}/jms/persistence/JMSStorageManager.java | 0 .../jms/persistence/config/PersistedBindings.java | 0 .../config/PersistedConnectionFactory.java | 0 .../persistence/config/PersistedDestination.java | 0 .../jms/persistence/config/PersistedType.java | 0 .../impl/journal/JMSJournalStorageManagerImpl.java | 0 .../impl/nullpm/NullJMSStorageManagerImpl.java | 0 .../jms/server/ActiveMQJMSServerBundle.java | 0 .../jms/server/ActiveMQJMSServerLogger.java | 0 .../artemis}/jms/server/JMSServerConfigParser.java | 0 .../artemis}/jms/server/JMSServerManager.java | 0 .../config/ConnectionFactoryConfiguration.java | 0 .../jms/server/config/JMSConfiguration.java | 0 .../jms/server/config/JMSQueueConfiguration.java | 0 .../jms/server/config/TopicConfiguration.java | 0 .../impl/ConnectionFactoryConfigurationImpl.java | 0 .../server/config/impl/FileJMSConfiguration.java | 0 .../server/config/impl/JMSConfigurationImpl.java | 0 .../config/impl/JMSQueueConfigurationImpl.java | 0 .../server/config/impl/TopicConfigurationImpl.java | 0 .../impl/TransportConfigurationEncodingSupport.java | 0 .../artemis}/jms/server/embedded/EmbeddedJMS.java | 0 .../jms/server/impl/JMSServerManagerImpl.java | 0 .../jms/server/management/JMSManagementService.java | 0 .../jms/server/management/JMSNotificationType.java | 0 .../management/impl/JMSManagementServiceImpl.java | 0 .../jms/transaction/JMSTransactionDetail.java | 0 .../src/main/resources/schema/activemq-jms.xsd | 0 {activemq-journal => artemis-journal}/pom.xml | 0 .../activemq/artemis}/core/asyncio/AIOCallback.java | 0 .../artemis}/core/asyncio/AsynchronousFile.java | 0 .../artemis}/core/asyncio/BufferCallback.java | 0 .../artemis}/core/asyncio/IOExceptionListener.java | 0 .../core/asyncio/impl/ActiveMQFileLock.java | 0 .../core/asyncio/impl/AsynchronousFileImpl.java | 0 .../artemis}/core/journal/EncodingSupport.java | 0 .../activemq/artemis}/core/journal/IOAsyncTask.java | 0 .../artemis}/core/journal/IOCompletion.java | 0 .../core/journal/IOCriticalErrorListener.java | 0 .../activemq/artemis}/core/journal/Journal.java | 0 .../core/journal/JournalLoadInformation.java | 0 .../artemis}/core/journal/LoaderCallback.java | 0 .../core/journal/PreparedTransactionInfo.java | 0 .../activemq/artemis}/core/journal/RecordInfo.java | 0 .../artemis}/core/journal/SequentialFile.java | 0 .../core/journal/SequentialFileFactory.java | 0 .../artemis}/core/journal/TestableJournal.java | 0 .../core/journal/TransactionFailureCallback.java | 0 .../core/journal/impl/AIOSequentialFile.java | 0 .../core/journal/impl/AIOSequentialFileFactory.java | 0 .../journal/impl/AbstractJournalUpdateTask.java | 0 .../core/journal/impl/AbstractSequentialFile.java | 0 .../journal/impl/AbstractSequentialFileFactory.java | 0 .../artemis}/core/journal/impl/CompactJournal.java | 0 .../artemis}/core/journal/impl/DummyCallback.java | 0 .../core/journal/impl/FileWrapperJournal.java | 0 .../artemis}/core/journal/impl/JournalBase.java | 0 .../core/journal/impl/JournalCompactor.java | 0 .../core/journal/impl/JournalConstants.java | 0 .../artemis}/core/journal/impl/JournalFile.java | 0 .../artemis}/core/journal/impl/JournalFileImpl.java | 0 .../core/journal/impl/JournalFilesRepository.java | 0 .../artemis}/core/journal/impl/JournalImpl.java | 0 .../core/journal/impl/JournalReaderCallback.java | 0 .../journal/impl/JournalReaderCallbackAbstract.java | 0 .../artemis}/core/journal/impl/JournalRecord.java | 0 .../core/journal/impl/JournalRecordProvider.java | 0 .../core/journal/impl/JournalTransaction.java | 0 .../core/journal/impl/NIOSequentialFile.java | 0 .../core/journal/impl/NIOSequentialFileFactory.java | 0 .../artemis}/core/journal/impl/Reclaimer.java | 0 .../core/journal/impl/SimpleWaitIOCallback.java | 0 .../core/journal/impl/SyncIOCompletion.java | 0 .../artemis}/core/journal/impl/SyncSpeedTest.java | 0 .../artemis}/core/journal/impl/TimedBuffer.java | 0 .../core/journal/impl/TimedBufferObserver.java | 0 .../core/journal/impl/TransactionCallback.java | 0 .../journal/impl/dataformat/ByteArrayEncoding.java | 0 .../journal/impl/dataformat/JournalAddRecord.java | 0 .../journal/impl/dataformat/JournalAddRecordTX.java | 0 .../impl/dataformat/JournalCompleteRecordTX.java | 0 .../impl/dataformat/JournalDeleteRecord.java | 0 .../impl/dataformat/JournalDeleteRecordTX.java | 0 .../impl/dataformat/JournalInternalRecord.java | 0 .../impl/dataformat/JournalRollbackRecordTX.java | 0 .../artemis}/journal/ActiveMQJournalBundle.java | 0 .../artemis}/journal/ActiveMQJournalLogger.java | 0 .../pom.xml | 0 .../activemq/artemis}/maven/ActiveMQClient.java | 0 .../artemis}/maven/ActiveMQClientPlugin.java | 0 .../artemis}/maven/ActiveMQStartPlugin.java | 0 .../activemq/artemis}/maven/ActiveMQStopPlugin.java | 0 .../artemis}/maven/InVMNodeManagerServer.java | 0 .../apache/activemq/artemis}/maven/PluginUtil.java | 0 .../activemq/artemis}/maven/TestClusterManager.java | 0 .../artemis}/maven/TestClusterManagerMBean.java | 0 .../apache/activemq/artemis}/maven/TestNode.java | 0 .../activemq/artemis}/server/ActiveMQBootstrap.java | 0 .../artemis}/server/SpawnedActiveMQBootstrap.java | 0 .../activemq/artemis}/server/SpawnedVMSupport.java | 0 {activemq-native => artemis-native}/README | 0 .../bin/libactivemqAIO32.so | Bin .../bin/libactivemqAIO64.so | Bin .../compile-native.sh | 0 {activemq-native => artemis-native}/pom.xml | 0 .../src/main/c/AIOController.cpp | 0 .../src/main/c/AIOController.h | 0 .../src/main/c/AIOException.h | 0 .../src/main/c/AsyncFile.cpp | 0 .../src/main/c/AsyncFile.h | 0 .../src/main/c/CallbackAdapter.h | 0 .../src/main/c/JAIODatatypes.h | 0 .../src/main/c/JNICallbackAdapter.cpp | 0 .../src/main/c/JNICallbackAdapter.h | 0 .../src/main/c/JNI_AsynchronousFileImpl.cpp | 0 .../src/main/c/JavaUtilities.cpp | 0 .../src/main/c/JavaUtilities.h | 0 .../src/main/c/LockClass.h | 0 .../src/main/c/Version.h | 0 .../activemq/artemis}/core/libaio/Native.java | 0 .../artemis-amqp-protocol}/pom.xml | 0 .../proton/ActiveMQProtonRemotingConnection.java | 0 .../core/protocol/proton/ProtonProtocolManager.java | 0 .../proton/ProtonProtocolManagerFactory.java | 0 .../proton/converter/ActiveMQJMSVendor.java | 0 .../proton/converter/ProtonMessageConverter.java | 0 .../proton/converter/jms/ServerJMSBytesMessage.java | 0 .../proton/converter/jms/ServerJMSMapMessage.java | 0 .../proton/converter/jms/ServerJMSMessage.java | 0 .../converter/jms/ServerJMSStreamMessage.java | 0 .../proton/converter/jms/ServerJMSTextMessage.java | 0 .../protocol/proton/converter/jms/package-info.java | 0 .../plug/ActiveMQProtonConnectionCallback.java | 0 .../plug/ProtonSessionIntegrationCallback.java | 0 .../core/protocol/proton/plug/package-info.java | 0 .../protocol/proton/sasl/ActiveMQPlainSASL.java | 0 ...ctivemq.spi.core.protocol.ProtocolManagerFactory | 0 .../core/protocol/proton/TestConversions.java | 0 .../artemis-openwire-protocol}/pom.xml | 0 .../core/protocol/openwire/AMQConnectorImpl.java | 0 .../core/protocol/openwire/AMQTransactionImpl.java | 0 .../core/protocol/openwire/BrokerState.java | 0 .../core/protocol/openwire/DataInputWrapper.java | 0 .../protocol/openwire/NotEnoughBytesException.java | 0 .../core/protocol/openwire/OpenWireConnection.java | 0 .../protocol/openwire/OpenWireMessageConverter.java | 0 .../protocol/openwire/OpenWireProtocolManager.java | 0 .../openwire/OpenWireProtocolManagerFactory.java | 0 .../core/protocol/openwire/OpenWireUtil.java | 0 .../core/protocol/openwire/SendingResult.java | 0 .../openwire/amq/AMQAbstractDeadLetterStrategy.java | 0 .../openwire/amq/AMQBrokerStoppedException.java | 0 .../protocol/openwire/amq/AMQConnectionContext.java | 0 .../core/protocol/openwire/amq/AMQConnector.java | 0 .../openwire/amq/AMQConnectorStatistics.java | 0 .../core/protocol/openwire/amq/AMQConsumer.java | 0 .../openwire/amq/AMQConsumerBrokerExchange.java | 0 .../openwire/amq/AMQDeadLetterStrategy.java | 0 .../core/protocol/openwire/amq/AMQDestination.java | 0 .../openwire/amq/AMQDestinationStatistics.java | 0 .../amq/AMQMapTransportConnectionStateRegister.java | 0 .../openwire/amq/AMQMessageAuthorizationPolicy.java | 0 .../core/protocol/openwire/amq/AMQMessageStore.java | 0 .../openwire/amq/AMQPersistenceAdapter.java | 0 .../core/protocol/openwire/amq/AMQProducer.java | 0 .../openwire/amq/AMQProducerBrokerExchange.java | 0 .../protocol/openwire/amq/AMQSecurityContext.java | 0 .../protocol/openwire/amq/AMQServerConsumer.java | 0 .../protocol/openwire/amq/AMQServerSession.java | 0 .../openwire/amq/AMQServerSessionFactory.java | 0 .../core/protocol/openwire/amq/AMQSession.java | 0 .../openwire/amq/AMQSharedDeadLetterStrategy.java | 0 .../AMQSingleTransportConnectionStateRegister.java | 0 .../openwire/amq/AMQSlowConsumerStrategy.java | 0 .../core/protocol/openwire/amq/AMQSubscription.java | 0 .../openwire/amq/AMQSubscriptionRecovery.java | 0 .../core/protocol/openwire/amq/AMQTransaction.java | 0 .../openwire/amq/AMQTransactionFactory.java | 0 .../openwire/amq/AMQTransportConnectionState.java | 0 .../amq/AMQTransportConnectionStateRegister.java | 0 .../core/protocol/openwire/amq/BrowserListener.java | 0 .../core/protocol/openwire/amq/MessageInfo.java | 0 ...ctivemq.spi.core.protocol.ProtocolManagerFactory | 0 .../artemis-proton-plug}/pom.xml | 0 .../proton/plug/AMQPClientConnectionContext.java | 0 .../org/proton/plug/AMQPClientReceiverContext.java | 0 .../org/proton/plug/AMQPClientSenderContext.java | 0 .../org/proton/plug/AMQPClientSessionContext.java | 0 .../org/proton/plug/AMQPConnectionCallback.java | 0 .../java/org/proton/plug/AMQPConnectionContext.java | 0 .../proton/plug/AMQPConnectionContextFactory.java | 0 .../proton/plug/AMQPServerConnectionContext.java | 0 .../java/org/proton/plug/AMQPSessionCallback.java | 0 .../java/org/proton/plug/AMQPSessionContext.java | 0 .../src/main/java/org/proton/plug/ClientSASL.java | 0 .../src/main/java/org/proton/plug/SASLResult.java | 0 .../src/main/java/org/proton/plug/ServerSASL.java | 0 .../plug/context/AbstractConnectionContext.java | 0 .../plug/context/AbstractProtonContextSender.java | 0 .../plug/context/AbstractProtonReceiverContext.java | 0 .../plug/context/AbstractProtonSessionContext.java | 0 .../proton/plug/context/ProtonDeliveryHandler.java | 0 .../proton/plug/context/ProtonInitializable.java | 0 .../org/proton/plug/context/ProtonPlugSender.java | 0 .../plug/context/ProtonTransactionHandler.java | 0 .../client/ProtonClientConnectionContext.java | 0 .../ProtonClientConnectionContextFactory.java | 0 .../plug/context/client/ProtonClientContext.java | 0 .../context/client/ProtonClientReceiverContext.java | 0 .../context/client/ProtonClientSessionContext.java | 0 .../server/ProtonServerConnectionContext.java | 0 .../ProtonServerConnectionContextFactory.java | 0 .../context/server/ProtonServerReceiverContext.java | 0 .../context/server/ProtonServerSenderContext.java | 0 .../context/server/ProtonServerSessionContext.java | 0 .../plug/exceptions/ActiveMQAMQPException.java | 0 .../ActiveMQAMQPIllegalStateException.java | 0 .../ActiveMQAMQPInternalErrorException.java | 0 .../ActiveMQAMQPInvalidFieldException.java | 0 .../ActiveMQAMQPNotImplementedException.java | 0 .../exceptions/ActiveMQAMQPTimeoutException.java | 0 .../java/org/proton/plug/handler/EventHandler.java | 0 .../main/java/org/proton/plug/handler/Events.java | 0 .../java/org/proton/plug/handler/ProtonHandler.java | 0 .../plug/handler/impl/DefaultEventHandler.java | 0 .../proton/plug/handler/impl/ProtonHandlerImpl.java | 0 .../logger/ActiveMQAMQPProtocolMessageBundle.java | 0 .../org/proton/plug/sasl/AnonymousServerSASL.java | 0 .../java/org/proton/plug/sasl/ClientSASLPlain.java | 0 .../java/org/proton/plug/sasl/PlainSASLResult.java | 0 .../java/org/proton/plug/sasl/ServerSASLPlain.java | 0 .../main/java/org/proton/plug/util/ByteUtil.java | 0 .../main/java/org/proton/plug/util/CodecCache.java | 0 .../java/org/proton/plug/util/CreditsSemaphore.java | 0 .../main/java/org/proton/plug/util/DebugInfo.java | 0 .../java/org/proton/plug/util/DeliveryUtil.java | 0 .../java/org/proton/plug/util/FutureRunnable.java | 0 .../java/org/proton/plug/util/NettyWritable.java | 0 .../org/proton/plug/util/ProtonServerMessage.java | 0 .../java/org/proton/plug/util/ReusableLatch.java | 0 .../plug/context/AbstractConnectionContextTest.java | 0 .../java/org/proton/plug/test/AbstractJMSTest.java | 0 .../test/java/org/proton/plug/test/Constants.java | 0 .../test/java/org/proton/plug/test/ProtonTest.java | 0 .../proton/plug/test/invm/InVMTestConnector.java | 0 .../org/proton/plug/test/invm/ProtonINVMSPI.java | 0 .../plug/test/minimalclient/AMQPClientSPI.java | 0 .../proton/plug/test/minimalclient/Connector.java | 0 .../test/minimalclient/SimpleAMQPConnector.java | 0 .../proton/plug/test/minimalserver/DumbServer.java | 0 .../test/minimalserver/MinimalConnectionSPI.java | 0 .../plug/test/minimalserver/MinimalServer.java | 0 .../plug/test/minimalserver/MinimalSessionSPI.java | 0 .../minimalserver/SimpleServerThreadFactory.java | 0 .../org/proton/plug/test/sasl/PlainSASLTest.java | 0 .../proton/plug/test/util/CreditsSemaphoreTest.java | 0 .../proton/plug/test/util/ReusableLatchTest.java | 0 .../plug/test/util/SimpleServerAbstractTest.java | 0 .../artemis-stomp-protocol}/pom.xml | 0 .../core/protocol/stomp/ActiveMQStompException.java | 0 .../protocol/stomp/ActiveMQStompProtocolLogger.java | 0 .../stomp/ActiveMQStompProtocolMessageBundle.java | 0 .../core/protocol/stomp/FrameEventListener.java | 0 .../artemis}/core/protocol/stomp/SimpleBytes.java | 0 .../artemis}/core/protocol/stomp/Stomp.java | 0 .../artemis}/core/protocol/stomp/StompCommands.java | 0 .../core/protocol/stomp/StompConnection.java | 0 .../artemis}/core/protocol/stomp/StompDecoder.java | 0 .../artemis}/core/protocol/stomp/StompFrame.java | 0 .../core/protocol/stomp/StompFrameInterceptor.java | 0 .../core/protocol/stomp/StompProtocolManager.java | 0 .../protocol/stomp/StompProtocolManagerFactory.java | 0 .../artemis}/core/protocol/stomp/StompSession.java | 0 .../core/protocol/stomp/StompSubscription.java | 0 .../artemis}/core/protocol/stomp/StompUtils.java | 0 .../artemis}/core/protocol/stomp/StompVersions.java | 0 .../protocol/stomp/VersionedStompFrameHandler.java | 0 .../protocol/stomp/v10/StompFrameHandlerV10.java | 0 .../core/protocol/stomp/v10/StompFrameV10.java | 0 .../protocol/stomp/v11/StompFrameHandlerV11.java | 0 .../core/protocol/stomp/v11/StompFrameV11.java | 0 .../protocol/stomp/v12/StompFrameHandlerV12.java | 0 .../core/protocol/stomp/v12/StompFrameV12.java | 0 ...ctivemq.spi.core.protocol.ProtocolManagerFactory | 0 {activemq-protocols => artemis-protocols}/pom.xml | 0 {activemq-ra => artemis-ra}/pom.xml | 0 .../activemq/artemis}/ra/ActiveMQRABundle.java | 0 .../artemis}/ra/ActiveMQRABytesMessage.java | 0 .../artemis}/ra/ActiveMQRAConnectionFactory.java | 0 .../ra/ActiveMQRAConnectionFactoryImpl.java | 0 .../artemis}/ra/ActiveMQRAConnectionManager.java | 0 .../artemis}/ra/ActiveMQRAConnectionMetaData.java | 0 .../ra/ActiveMQRAConnectionRequestInfo.java | 0 .../activemq/artemis}/ra/ActiveMQRACredential.java | 0 .../activemq/artemis}/ra/ActiveMQRAJMSContext.java | 0 .../artemis}/ra/ActiveMQRALocalTransaction.java | 0 .../activemq/artemis}/ra/ActiveMQRALogger.java | 0 .../artemis}/ra/ActiveMQRAMCFProperties.java | 0 .../artemis}/ra/ActiveMQRAManagedConnection.java | 0 .../ra/ActiveMQRAManagedConnectionFactory.java | 0 .../activemq/artemis}/ra/ActiveMQRAMapMessage.java | 0 .../activemq/artemis}/ra/ActiveMQRAMessage.java | 0 .../artemis}/ra/ActiveMQRAMessageConsumer.java | 0 .../artemis}/ra/ActiveMQRAMessageListener.java | 0 .../artemis}/ra/ActiveMQRAMessageProducer.java | 0 .../activemq/artemis}/ra/ActiveMQRAMetaData.java | 0 .../artemis}/ra/ActiveMQRAObjectMessage.java | 0 .../activemq/artemis}/ra/ActiveMQRAProperties.java | 0 .../artemis}/ra/ActiveMQRAQueueReceiver.java | 0 .../activemq/artemis}/ra/ActiveMQRAQueueSender.java | 0 .../activemq/artemis}/ra/ActiveMQRAService.java | 0 .../activemq/artemis}/ra/ActiveMQRASession.java | 0 .../artemis}/ra/ActiveMQRASessionFactory.java | 0 .../artemis}/ra/ActiveMQRASessionFactoryImpl.java | 0 .../artemis}/ra/ActiveMQRAStreamMessage.java | 0 .../activemq/artemis}/ra/ActiveMQRATextMessage.java | 0 .../artemis}/ra/ActiveMQRATopicPublisher.java | 0 .../artemis}/ra/ActiveMQRATopicSubscriber.java | 0 .../artemis}/ra/ActiveMQRAXAJMSContext.java | 0 .../activemq/artemis}/ra/ActiveMQRAXAResource.java | 0 .../activemq/artemis}/ra/ActiveMQRaUtils.java | 0 .../artemis}/ra/ActiveMQResourceAdapter.java | 0 .../artemis}/ra/ConnectionFactoryProperties.java | 0 .../artemis}/ra/inflow/ActiveMQActivation.java | 0 .../artemis}/ra/inflow/ActiveMQActivationSpec.java | 0 .../artemis}/ra/inflow/ActiveMQMessageHandler.java | 0 .../org/apache/activemq/artemis}/ra/package.html | 0 .../artemis}/ra/recovery/RecoveryManager.java | 0 {activemq-rest => artemis-rest}/pom.xml | 0 .../org/apache/activemq/artemis}/rest/ActiveMQ.java | 0 .../activemq/artemis}/rest/ActiveMQRestBundle.java | 0 .../activemq/artemis}/rest/ActiveMQRestLogger.java | 0 .../activemq/artemis}/rest/HttpHeaderProperty.java | 0 .../java/org/apache/activemq/artemis}/rest/Jms.java | 0 .../artemis}/rest/MessageServiceConfiguration.java | 0 .../artemis}/rest/MessageServiceManager.java | 0 .../activemq/artemis}/rest/UnknownMediaType.java | 0 .../activemq/artemis}/rest/UnmarshalException.java | 0 .../rest/integration/ActiveMQBootstrapListener.java | 0 .../rest/integration/EmbeddedRestActiveMQ.java | 0 .../rest/integration/EmbeddedRestActiveMQJMS.java | 0 .../integration/RestMessagingBootstrapListener.java | 0 .../integration/ServletContextBindingRegistry.java | 0 .../rest/queue/AcknowledgedQueueConsumer.java | 0 .../artemis}/rest/queue/Acknowledgement.java | 0 .../artemis}/rest/queue/ConsumedHttpMessage.java | 0 .../artemis}/rest/queue/ConsumedMessage.java | 0 .../artemis}/rest/queue/ConsumedObjectMessage.java | 0 .../artemis}/rest/queue/ConsumersResource.java | 0 .../artemis}/rest/queue/DestinationResource.java | 0 .../rest/queue/DestinationServiceManager.java | 0 .../artemis}/rest/queue/DestinationSettings.java | 0 .../activemq/artemis}/rest/queue/PostMessage.java | 0 .../artemis}/rest/queue/PostMessageDupsOk.java | 0 .../artemis}/rest/queue/PostMessageNoDups.java | 0 .../activemq/artemis}/rest/queue/QueueConsumer.java | 0 .../artemis}/rest/queue/QueueDeployment.java | 0 .../rest/queue/QueueDestinationsResource.java | 0 .../activemq/artemis}/rest/queue/QueueResource.java | 0 .../artemis}/rest/queue/QueueServiceManager.java | 0 .../rest/queue/push/ActiveMQPushStrategy.java | 0 .../artemis}/rest/queue/push/FilePushStore.java | 0 .../artemis}/rest/queue/push/PushConsumer.java | 0 .../rest/queue/push/PushConsumerMessageHandler.java | 0 .../rest/queue/push/PushConsumerResource.java | 0 .../artemis}/rest/queue/push/PushStore.java | 0 .../artemis}/rest/queue/push/PushStrategy.java | 0 .../artemis}/rest/queue/push/UriStrategy.java | 0 .../rest/queue/push/UriTemplateStrategy.java | 0 .../rest/queue/push/xml/Authentication.java | 0 .../rest/queue/push/xml/AuthenticationType.java | 0 .../artemis}/rest/queue/push/xml/BasicAuth.java | 0 .../artemis}/rest/queue/push/xml/DigestAuth.java | 0 .../rest/queue/push/xml/PushRegistration.java | 0 .../artemis}/rest/queue/push/xml/XmlHttpHeader.java | 0 .../artemis}/rest/queue/push/xml/XmlLink.java | 0 .../topic/AcknowledgedSubscriptionResource.java | 0 .../artemis}/rest/topic/FileTopicPushStore.java | 0 .../artemis}/rest/topic/PushSubscription.java | 0 .../rest/topic/PushSubscriptionsResource.java | 0 .../artemis}/rest/topic/PushTopicRegistration.java | 0 .../activemq/artemis}/rest/topic/Subscription.java | 0 .../artemis}/rest/topic/SubscriptionResource.java | 0 .../artemis}/rest/topic/SubscriptionsResource.java | 0 .../artemis}/rest/topic/TopicDeployment.java | 0 .../rest/topic/TopicDestinationsResource.java | 0 .../artemis}/rest/topic/TopicPushStore.java | 0 .../activemq/artemis}/rest/topic/TopicResource.java | 0 .../artemis}/rest/topic/TopicServiceManager.java | 0 .../activemq/artemis}/rest/util/Constants.java | 0 .../rest/util/CustomHeaderLinkStrategy.java | 0 .../artemis}/rest/util/HttpMessageHelper.java | 0 .../artemis}/rest/util/LinkHeaderLinkStrategy.java | 0 .../activemq/artemis}/rest/util/LinkStrategy.java | 0 .../activemq/artemis}/rest/util/TimeoutTask.java | 0 .../src/main/resources/schema/hornetq-rest.xsd | 0 .../artemis}/rest/test/AutoAckQueueTest.java | 0 .../artemis}/rest/test/AutoAckTopicTest.java | 0 .../artemis}/rest/test/ClientAckQueueTest.java | 0 .../artemis}/rest/test/ClientAckTopicTest.java | 0 .../artemis}/rest/test/CreateDestinationTest.java | 0 .../activemq/artemis}/rest/test/DupQueueTest.java | 0 .../activemq/artemis}/rest/test/Embedded.java | 0 .../activemq/artemis}/rest/test/EmbeddedTest.java | 0 .../artemis}/rest/test/FindDestinationTest.java | 0 .../apache/activemq/artemis}/rest/test/JMSTest.java | 0 .../artemis}/rest/test/MessageTestBase.java | 0 .../rest/test/PersistentPushQueueConsumerTest.java | 0 .../rest/test/PersistentPushTopicConsumerTest.java | 0 .../artemis}/rest/test/PushQueueConsumerTest.java | 0 .../artemis}/rest/test/PushTopicConsumerTest.java | 0 .../activemq/artemis}/rest/test/RawAckTest.java | 0 .../artemis}/rest/test/RepostingQueueTest.java | 0 .../artemis}/rest/test/RepostingTopicTest.java | 0 .../artemis}/rest/test/RoundtripTimeTest.java | 0 .../activemq/artemis}/rest/test/SelectorTest.java | 0 .../activemq/artemis}/rest/test/SessionTest.java | 0 .../activemq/artemis}/rest/test/TransformTest.java | 0 .../apache/activemq/artemis}/rest/test/Util.java | 0 .../apache/activemq/artemis}/rest/test/XmlTest.java | 0 .../src/test/resources/activemq-configuration.xml | 0 .../src/test/resources/activemq-rest.xml | 0 .../src/test/resources/activemq-roles.properties | 0 .../src/test/resources/activemq-users.properties | 0 {activemq-selector => artemis-selector}/pom.xml | 0 .../selector/filter/ArithmeticExpression.java | 0 .../artemis}/selector/filter/BinaryExpression.java | 0 .../artemis}/selector/filter/BooleanExpression.java | 0 .../selector/filter/ComparisonExpression.java | 0 .../selector/filter/ConstantExpression.java | 0 .../artemis}/selector/filter/Expression.java | 0 .../artemis}/selector/filter/FilterException.java | 0 .../artemis}/selector/filter/Filterable.java | 0 .../artemis}/selector/filter/LogicExpression.java | 0 .../selector/filter/PropertyExpression.java | 0 .../artemis}/selector/filter/UnaryExpression.java | 0 .../artemis}/selector/filter/XPathExpression.java | 0 .../artemis}/selector/filter/XQueryExpression.java | 0 .../selector/filter/XalanXPathEvaluator.java | 0 .../activemq/artemis}/selector/filter/package.html | 0 .../activemq/artemis}/selector/impl/LRUCache.java | 0 .../artemis}/selector/impl/SelectorParser.java | 0 .../src/main/javacc/HyphenatedParser.jj | 0 .../src/main/javacc/StrictParser.jj | 0 .../artemis}/selector/SelectorParserTest.java | 0 .../activemq/artemis}/selector/SelectorTest.java | 0 {activemq-server => artemis-server}/pom.xml | 0 .../api/core/management/MessageCounterInfo.java | 0 .../artemis}/core/config/BackupStrategy.java | 0 .../artemis}/core/config/BridgeConfiguration.java | 0 .../core/config/ClusterConnectionConfiguration.java | 0 .../artemis}/core/config/Configuration.java | 0 .../artemis}/core/config/ConfigurationUtils.java | 0 .../core/config/ConnectorServiceConfiguration.java | 0 .../core/config/CoreQueueConfiguration.java | 0 .../artemis}/core/config/DivertConfiguration.java | 0 .../artemis}/core/config/FileDeploymentManager.java | 0 .../artemis}/core/config/HAPolicyConfiguration.java | 0 .../core/config/ScaleDownConfiguration.java | 0 .../config/ha/ColocatedPolicyConfiguration.java | 0 .../core/config/ha/LiveOnlyPolicyConfiguration.java | 0 .../core/config/ha/ReplicaPolicyConfiguration.java | 0 .../config/ha/ReplicatedPolicyConfiguration.java | 0 .../ha/SharedStoreMasterPolicyConfiguration.java | 0 .../ha/SharedStoreSlavePolicyConfiguration.java | 0 .../core/config/impl/ConfigurationImpl.java | 0 .../core/config/impl/FileConfiguration.java | 0 .../core/config/impl/FileSecurityConfiguration.java | 0 .../core/config/impl/SecurityConfiguration.java | 0 .../artemis}/core/config/impl/Validators.java | 0 .../artemis}/core/deployers/Deployable.java | 0 .../deployers/impl/FileConfigurationParser.java | 0 .../activemq/artemis}/core/filter/Filter.java | 0 .../artemis}/core/filter/impl/FilterImpl.java | 0 .../core/management/impl/AbstractControl.java | 0 .../core/management/impl/AcceptorControlImpl.java | 0 .../management/impl/ActiveMQServerControlImpl.java | 0 .../core/management/impl/AddressControlImpl.java | 0 .../core/management/impl/BridgeControlImpl.java | 0 .../management/impl/BroadcastGroupControlImpl.java | 0 .../impl/ClusterConnectionControlImpl.java | 0 .../core/management/impl/DivertControlImpl.java | 0 .../core/management/impl/MBeanInfoHelper.java | 0 .../core/management/impl/QueueControlImpl.java | 0 .../core/messagecounter/MessageCounter.java | 0 .../core/messagecounter/MessageCounterManager.java | 0 .../messagecounter/impl/MessageCounterHelper.java | 0 .../impl/MessageCounterManagerImpl.java | 0 .../artemis}/core/paging/PageTransactionInfo.java | 0 .../activemq/artemis}/core/paging/PagedMessage.java | 0 .../artemis}/core/paging/PagingManager.java | 0 .../activemq/artemis}/core/paging/PagingStore.java | 0 .../artemis}/core/paging/PagingStoreFactory.java | 0 .../artemis}/core/paging/cursor/LivePageCache.java | 0 .../artemis}/core/paging/cursor/PageCache.java | 0 .../core/paging/cursor/PageCursorProvider.java | 0 .../artemis}/core/paging/cursor/PageIterator.java | 0 .../artemis}/core/paging/cursor/PagePosition.java | 0 .../core/paging/cursor/PageSubscription.java | 0 .../core/paging/cursor/PageSubscriptionCounter.java | 0 .../artemis}/core/paging/cursor/PagedReference.java | 0 .../core/paging/cursor/PagedReferenceImpl.java | 0 .../core/paging/cursor/impl/LivePageCacheImpl.java | 0 .../core/paging/cursor/impl/PageCacheImpl.java | 0 .../paging/cursor/impl/PageCursorProviderImpl.java | 0 .../core/paging/cursor/impl/PagePositionImpl.java | 0 .../cursor/impl/PageSubscriptionCounterImpl.java | 0 .../paging/cursor/impl/PageSubscriptionImpl.java | 0 .../activemq/artemis}/core/paging/impl/Page.java | 0 .../artemis}/core/paging/impl/PageSyncTimer.java | 0 .../core/paging/impl/PageTransactionInfoImpl.java | 0 .../artemis}/core/paging/impl/PagedMessageImpl.java | 0 .../core/paging/impl/PagingManagerImpl.java | 0 .../core/paging/impl/PagingStoreFactoryNIO.java | 0 .../artemis}/core/paging/impl/PagingStoreImpl.java | 0 .../artemis}/core/persistence/GroupingInfo.java | 0 .../artemis}/core/persistence/OperationContext.java | 0 .../artemis}/core/persistence/QueueBindingInfo.java | 0 .../artemis}/core/persistence/StorageManager.java | 0 .../persistence/config/PersistedAddressSetting.java | 0 .../core/persistence/config/PersistedRoles.java | 0 .../core/persistence/impl/PageCountPending.java | 0 .../persistence/impl/journal/AddMessageRecord.java | 0 .../impl/journal/BatchingIDGenerator.java | 0 .../persistence/impl/journal/DescribeJournal.java | 0 .../persistence/impl/journal/JournalRecordIds.java | 0 .../impl/journal/JournalStorageManager.java | 0 .../impl/journal/LargeServerMessageImpl.java | 0 .../impl/journal/LargeServerMessageInSync.java | 0 .../impl/journal/OperationContextImpl.java | 0 .../impl/nullpm/NullStorageLargeServerMessage.java | 0 .../persistence/impl/nullpm/NullStorageManager.java | 0 .../activemq/artemis}/core/postoffice/Address.java | 0 .../artemis}/core/postoffice/AddressManager.java | 0 .../activemq/artemis}/core/postoffice/Binding.java | 0 .../artemis}/core/postoffice/BindingType.java | 0 .../activemq/artemis}/core/postoffice/Bindings.java | 0 .../artemis}/core/postoffice/BindingsFactory.java | 0 .../artemis}/core/postoffice/DuplicateIDCache.java | 0 .../artemis}/core/postoffice/PostOffice.java | 0 .../artemis}/core/postoffice/QueueBinding.java | 0 .../artemis}/core/postoffice/QueueInfo.java | 0 .../artemis}/core/postoffice/impl/AddressImpl.java | 0 .../artemis}/core/postoffice/impl/BindingsImpl.java | 0 .../core/postoffice/impl/DivertBinding.java | 0 .../core/postoffice/impl/DuplicateIDCacheImpl.java | 0 .../core/postoffice/impl/LocalQueueBinding.java | 0 .../core/postoffice/impl/PostOfficeImpl.java | 0 .../core/postoffice/impl/SimpleAddressManager.java | 0 .../postoffice/impl/WildcardAddressManager.java | 0 .../artemis}/core/protocol/ProtocolHandler.java | 0 .../artemis}/core/protocol/ServerPacketDecoder.java | 0 .../protocol/core/ServerSessionPacketHandler.java | 0 .../protocol/core/impl/ActiveMQPacketHandler.java | 0 .../protocol/core/impl/CoreProtocolManager.java | 0 .../core/impl/CoreProtocolManagerFactory.java | 0 .../protocol/core/impl/CoreSessionCallback.java | 0 .../impl/wireformat/BackupRegistrationMessage.java | 0 .../BackupReplicationStartFailedMessage.java | 0 .../core/impl/wireformat/BackupRequestMessage.java | 0 .../core/impl/wireformat/BackupResponseMessage.java | 0 .../core/impl/wireformat/ClusterConnectMessage.java | 0 .../impl/wireformat/ClusterConnectReplyMessage.java | 0 .../core/impl/wireformat/NodeAnnounceMessage.java | 0 .../core/impl/wireformat/QuorumVoteMessage.java | 0 .../impl/wireformat/QuorumVoteReplyMessage.java | 0 .../core/impl/wireformat/ReplicationAddMessage.java | 0 .../impl/wireformat/ReplicationAddTXMessage.java | 0 .../impl/wireformat/ReplicationCommitMessage.java | 0 .../impl/wireformat/ReplicationDeleteMessage.java | 0 .../impl/wireformat/ReplicationDeleteTXMessage.java | 0 .../ReplicationLargeMessageBeginMessage.java | 0 .../ReplicationLargeMessageEndMessage.java | 0 .../ReplicationLargeMessageWriteMessage.java | 0 .../ReplicationLiveIsStoppingMessage.java | 0 .../wireformat/ReplicationPageEventMessage.java | 0 .../wireformat/ReplicationPageWriteMessage.java | 0 .../impl/wireformat/ReplicationPrepareMessage.java | 0 .../impl/wireformat/ReplicationResponseMessage.java | 0 .../wireformat/ReplicationStartSyncMessage.java | 0 .../impl/wireformat/ReplicationSyncFileMessage.java | 0 .../impl/wireformat/ScaleDownAnnounceMessage.java | 0 .../core/protocol/stomp/WebSocketServerHandler.java | 0 .../artemis}/core/registry/JndiBindingRegistry.java | 0 .../artemis}/core/registry/MapBindingRegistry.java | 0 .../core/remoting/impl/invm/InVMAcceptor.java | 0 .../remoting/impl/invm/InVMAcceptorFactory.java | 0 .../core/remoting/impl/invm/InVMConnection.java | 0 .../core/remoting/impl/invm/InVMConnector.java | 0 .../remoting/impl/invm/InVMConnectorFactory.java | 0 .../core/remoting/impl/invm/InVMRegistry.java | 0 .../core/remoting/impl/invm/TransportConstants.java | 0 .../core/remoting/impl/netty/ConnectionCreator.java | 0 .../remoting/impl/netty/HttpAcceptorHandler.java | 0 .../remoting/impl/netty/HttpKeepAliveRunnable.java | 0 .../core/remoting/impl/netty/NettyAcceptor.java | 0 .../remoting/impl/netty/NettyAcceptorFactory.java | 0 .../remoting/impl/netty/NettyServerConnection.java | 0 .../core/remoting/server/RemotingService.java | 0 .../remoting/server/impl/RemotingServiceImpl.java | 0 .../core/replication/ReplicatedJournal.java | 0 .../core/replication/ReplicatedLargeMessage.java | 0 .../core/replication/ReplicationEndpoint.java | 0 .../core/replication/ReplicationManager.java | 0 .../activemq/artemis}/core/security/CheckType.java | 0 .../artemis}/core/security/SecurityStore.java | 0 .../activemq/artemis}/core/security/User.java | 0 .../core/security/impl/SecurityStoreImpl.java | 0 .../artemis}/core/server/ActivateCallback.java | 0 .../artemis}/core/server/ActivationParams.java | 0 .../artemis}/core/server/ActiveMQMessageBundle.java | 0 .../artemis}/core/server/ActiveMQServer.java | 0 .../artemis}/core/server/ActiveMQServerLogger.java | 0 .../artemis}/core/server/ActiveMQServers.java | 0 .../core/server/AutoCreatedQueueManager.java | 0 .../activemq/artemis}/core/server/Bindable.java | 0 .../artemis}/core/server/BindingQueryResult.java | 0 .../artemis}/core/server/ConnectorService.java | 0 .../core/server/ConnectorServiceFactory.java | 0 .../activemq/artemis}/core/server/Consumer.java | 0 .../activemq/artemis}/core/server/Divert.java | 0 .../activemq/artemis}/core/server/HandleStatus.java | 0 .../activemq/artemis}/core/server/JournalType.java | 0 .../artemis}/core/server/LargeServerMessage.java | 0 .../artemis}/core/server/LiveNodeLocator.java | 0 .../artemis}/core/server/MemoryManager.java | 0 .../artemis}/core/server/MessageReference.java | 0 .../activemq/artemis}/core/server/NodeManager.java | 0 .../apache/activemq/artemis}/core/server/Queue.java | 0 .../activemq/artemis}/core/server/QueueCreator.java | 0 .../activemq/artemis}/core/server/QueueFactory.java | 0 .../artemis}/core/server/RouteContextList.java | 0 .../artemis}/core/server/RoutingContext.java | 0 .../core/server/ScheduledDeliveryHandler.java | 0 .../artemis}/core/server/ServerConsumer.java | 0 .../artemis}/core/server/ServerMessage.java | 0 .../artemis}/core/server/ServerSession.java | 0 .../artemis}/core/server/ServerSessionFactory.java | 0 .../artemis}/core/server/TransientQueueManager.java | 0 .../ActiveMQServerSideProtocolManagerFactory.java | 0 .../artemis}/core/server/cluster/BackupManager.java | 0 .../artemis}/core/server/cluster/Bridge.java | 0 .../core/server/cluster/BroadcastGroup.java | 0 .../server/cluster/ClusterConfigurationUtil.java | 0 .../core/server/cluster/ClusterConnection.java | 0 .../core/server/cluster/ClusterControl.java | 0 .../core/server/cluster/ClusterController.java | 0 .../core/server/cluster/ClusterManager.java | 0 .../core/server/cluster/MessageFlowRecord.java | 0 .../core/server/cluster/RemoteQueueBinding.java | 0 .../artemis}/core/server/cluster/Transformer.java | 0 .../core/server/cluster/ha/BackupPolicy.java | 0 .../core/server/cluster/ha/ColocatedHAManager.java | 0 .../core/server/cluster/ha/ColocatedPolicy.java | 0 .../artemis}/core/server/cluster/ha/HAManager.java | 0 .../artemis}/core/server/cluster/ha/HAPolicy.java | 0 .../core/server/cluster/ha/LiveOnlyPolicy.java | 0 .../core/server/cluster/ha/ReplicaPolicy.java | 0 .../core/server/cluster/ha/ReplicatedPolicy.java | 0 .../core/server/cluster/ha/ScaleDownPolicy.java | 0 .../server/cluster/ha/SharedStoreMasterPolicy.java | 0 .../server/cluster/ha/SharedStoreSlavePolicy.java | 0 .../core/server/cluster/ha/StandaloneHAManager.java | 0 .../core/server/cluster/impl/BridgeImpl.java | 0 .../server/cluster/impl/BroadcastGroupImpl.java | 0 .../cluster/impl/ClusterConnectionBridge.java | 0 .../server/cluster/impl/ClusterConnectionImpl.java | 0 .../core/server/cluster/impl/Redistributor.java | 0 .../server/cluster/impl/RemoteQueueBindingImpl.java | 0 .../core/server/cluster/qourum/BooleanVote.java | 0 .../artemis}/core/server/cluster/qourum/Quorum.java | 0 .../core/server/cluster/qourum/QuorumManager.java | 0 .../core/server/cluster/qourum/QuorumVote.java | 0 .../server/cluster/qourum/QuorumVoteHandler.java | 0 .../cluster/qourum/QuorumVoteServerConnect.java | 0 .../cluster/qourum/SharedNothingBackupQuorum.java | 0 .../artemis}/core/server/cluster/qourum/Vote.java | 0 .../core/server/embedded/EmbeddedActiveMQ.java | 0 .../artemis}/core/server/group/GroupingHandler.java | 0 .../core/server/group/UnproposalListener.java | 0 .../core/server/group/impl/GroupBinding.java | 0 .../server/group/impl/GroupHandlingAbstract.java | 0 .../group/impl/GroupingHandlerConfiguration.java | 0 .../server/group/impl/LocalGroupingHandler.java | 0 .../artemis}/core/server/group/impl/Proposal.java | 0 .../server/group/impl/RemoteGroupingHandler.java | 0 .../artemis}/core/server/group/impl/Response.java | 0 .../core/server/impl/AIOFileLockNodeManager.java | 0 .../artemis}/core/server/impl/Activation.java | 0 .../core/server/impl/ActiveMQServerImpl.java | 0 .../impl/AnyLiveNodeLocatorForReplication.java | 0 .../server/impl/AnyLiveNodeLocatorForScaleDown.java | 0 .../server/impl/AutoCreatedQueueManagerImpl.java | 0 .../server/impl/BackupRecoveryJournalLoader.java | 0 .../core/server/impl/BackupTopologyListener.java | 0 .../core/server/impl/ColocatedActivation.java | 0 .../core/server/impl/ConnectorsService.java | 0 .../artemis}/core/server/impl/DivertImpl.java | 0 .../core/server/impl/FileLockNodeManager.java | 0 .../artemis}/core/server/impl/InVMNodeManager.java | 0 .../artemis}/core/server/impl/JournalLoader.java | 0 .../artemis}/core/server/impl/LastValueQueue.java | 0 .../artemis}/core/server/impl/LiveActivation.java | 0 .../core/server/impl/LiveOnlyActivation.java | 0 .../core/server/impl/MessageReferenceImpl.java | 0 .../impl/NamedLiveNodeLocatorForReplication.java | 0 .../impl/NamedLiveNodeLocatorForScaleDown.java | 0 .../core/server/impl/NamedNodeIdNodeLocator.java | 0 .../core/server/impl/PostOfficeJournalLoader.java | 0 .../artemis}/core/server/impl/QueueFactoryImpl.java | 0 .../artemis}/core/server/impl/QueueImpl.java | 0 .../artemis}/core/server/impl/RefsOperation.java | 0 .../artemis}/core/server/impl/ReplicationError.java | 0 .../core/server/impl/RoutingContextImpl.java | 0 .../artemis}/core/server/impl/ScaleDownHandler.java | 0 .../server/impl/ScheduledDeliveryHandlerImpl.java | 0 .../core/server/impl/ServerConsumerImpl.java | 0 .../artemis}/core/server/impl/ServerInfo.java | 0 .../core/server/impl/ServerMessageImpl.java | 0 .../core/server/impl/ServerSessionImpl.java | 0 .../artemis}/core/server/impl/ServiceRegistry.java | 0 .../server/impl/SharedNothingBackupActivation.java | 0 .../server/impl/SharedNothingLiveActivation.java | 0 .../server/impl/SharedStoreBackupActivation.java | 0 .../core/server/impl/SharedStoreLiveActivation.java | 0 .../core/server/impl/TransientQueueManagerImpl.java | 0 .../core/server/management/ManagementService.java | 0 .../management/impl/ManagementServiceImpl.java | 0 .../core/settings/HierarchicalRepository.java | 0 .../HierarchicalRepositoryChangeListener.java | 0 .../activemq/artemis}/core/settings/Mergeable.java | 0 .../core/settings/impl/AddressSettings.java | 0 .../settings/impl/HierarchicalObjectRepository.java | 0 .../activemq/artemis}/core/settings/impl/Match.java | 0 .../core/settings/impl/SlowConsumerPolicy.java | 0 .../artemis}/core/transaction/ResourceManager.java | 0 .../artemis}/core/transaction/Transaction.java | 0 .../core/transaction/TransactionDetail.java | 0 .../core/transaction/TransactionFactory.java | 0 .../core/transaction/TransactionOperation.java | 0 .../transaction/TransactionOperationAbstract.java | 0 .../transaction/TransactionPropertyIndexes.java | 0 .../transaction/impl/BindingsTransactionImpl.java | 0 .../transaction/impl/CoreTransactionDetail.java | 0 .../core/transaction/impl/ResourceManagerImpl.java | 0 .../core/transaction/impl/TransactionImpl.java | 0 .../artemis}/spi/core/naming/BindingRegistry.java | 0 .../protocol/AbstractProtocolManagerFactory.java | 0 .../spi/core/protocol/MessageConverter.java | 0 .../artemis}/spi/core/protocol/ProtocolManager.java | 0 .../spi/core/protocol/ProtocolManagerFactory.java | 0 .../artemis}/spi/core/protocol/SessionCallback.java | 0 .../artemis}/spi/core/remoting/Acceptor.java | 0 .../artemis}/spi/core/remoting/AcceptorFactory.java | 0 .../remoting/ServerConnectionLifeCycleListener.java | 0 .../spi/core/security/ActiveMQSecurityManager.java | 0 .../core/security/ActiveMQSecurityManagerImpl.java | 0 .../spi/core/security/JAASSecurityManager.java | 0 .../artemis}/spi/core/security/package-info.java | 0 .../uri/AcceptorTransportConfigurationParser.java | 0 .../InVMAcceptorTransportConfigurationSchema.java | 0 .../TCPAcceptorTransportConfigurationSchema.java | 0 .../artemis}/utils/XMLConfigurationUtil.java | 0 .../resources/schema/activemq-configuration.xsd | 0 .../src/main/resources/schema/activemq-server.xsd | 0 .../core/config/impl/ConfigurationImplTest.java | 0 .../config/impl/DefaultsFileConfigurationTest.java | 0 .../config/impl/FileConfigurationParserTest.java | 0 .../core/config/impl/FileConfigurationTest.java | 0 .../core/config/impl/HAPolicyConfigurationTest.java | 0 .../artemis}/core/config/impl/ValidatorsTest.java | 0 .../impl/WrongRoleFileConfigurationParserTest.java | 0 .../artemis}/core/filter/impl/FilterTest.java | 0 .../artemis}/core/list/PriorityLinkedListTest.java | 0 .../core/message/impl/MessagePropertyTest.java | 0 .../activemq/artemis}/core/security/RoleTest.java | 0 .../server/group/impl/ClusteredResetMockTest.java | 0 .../core/server/impl/EmbeddedServerTest.java | 0 .../server/impl/ScheduledDeliveryHandlerTest.java | 0 .../artemis}/core/settings/AddressSettingsTest.java | 0 .../artemis}/core/settings/RepositoryTest.java | 0 .../artemis}/core/version/impl/VersionImplTest.java | 0 .../tests/util/ColocatedActiveMQServer.java | 0 .../tests/util/CountDownSessionFailureListener.java | 0 .../artemis}/tests/util/InVMNodeManagerServer.java | 0 .../activemq/artemis}/tests/util/RemoveFolder.java | 0 .../artemis}/tests/util/ServiceTestBase.java | 0 .../artemis}/tests/util/SimpleStringTest.java | 0 .../artemis}/tests/util/SingleServerTestBase.java | 0 .../activemq/artemis}/tests/util/UnitTestCase.java | 0 .../test/resources/ConfigurationTest-defaults.xml | 0 .../resources/ConfigurationTest-full-config.xml | 0 .../test/resources/InvalidConfigurationTest0.xml | 0 .../test/resources/InvalidConfigurationTest1.xml | 0 .../test/resources/InvalidConfigurationTest2.xml | 0 .../test/resources/InvalidConfigurationTest3.xml | 0 .../test/resources/InvalidConfigurationTest4.xml | 0 .../test/resources/InvalidConfigurationTest5.xml | 0 .../test/resources/colocated-hapolicy-config.xml | 0 .../test/resources/colocated-hapolicy-config2.xml | 0 .../test/resources/divertRoutingNameNotRequired.xml | 0 .../test/resources/live-only-hapolicy-config.xml | 0 .../test/resources/live-only-hapolicy-config2.xml | 0 .../test/resources/live-only-hapolicy-config3.xml | 0 .../test/resources/live-only-hapolicy-config4.xml | 0 .../test/resources/live-only-hapolicy-config5.xml | 0 .../src/test/resources/logging.properties | 0 .../src/test/resources/replica-hapolicy-config.xml | 0 .../src/test/resources/replica-hapolicy-config2.xml | 0 .../src/test/resources/replica-hapolicy-config3.xml | 0 .../test/resources/replicated-hapolicy-config.xml | 0 .../shared-store-master-hapolicy-config.xml | 0 .../shared-store-slave-hapolicy-config.xml | 0 .../shared-store-slave-hapolicy-config2.xml | 0 .../shared-store-slave-hapolicy-config3.xml | 0 .../pom.xml | 0 .../extensions/ActiveMQServiceExtensionLogger.java | 0 .../artemis}/service/extensions/ServiceUtils.java | 0 .../transactions/TransactionManagerLocator.java | 0 .../extensions/xa/ActiveMQXAResourceWrapper.java | 0 .../xa/ActiveMQXAResourceWrapperFactory.java | 0 .../xa/ActiveMQXAResourceWrapperFactoryImpl.java | 0 .../xa/ActiveMQXAResourceWrapperImpl.java | 0 .../extensions/xa/recovery/ActiveMQRegistry.java | 0 .../xa/recovery/ActiveMQRegistryImpl.java | 0 .../xa/recovery/ActiveMQXARecoveryLogger.java | 0 .../xa/recovery/ActiveMQXAResourceRecovery.java | 0 .../xa/recovery/ActiveMQXAResourceWrapper.java | 0 .../extensions/xa/recovery/XARecoveryConfig.java | 0 .../DummyTransactionManagerLocator.java | 0 .../transactions/TransactionManagerLocatorTest.java | 0 .../tests/xa/ActiveMQXAResourceWrapperImplTest.java | 0 .../xa/MockActiveMQResourceWrapperFactory.java | 0 .../service/extensions/tests/xa/MockXAResource.java | 0 .../extensions/tests/xa/ServiceUtilsTest.java | 0 ...xtensions.transactions.TransactionManagerLocator | 0 {activemq-tools => artemis-tools}/pom.xml | 0 .../artemis}/tools/ActiveMQToolsLogger.java | 0 .../apache/activemq/artemis}/tools/DataTool.java | 0 .../activemq/artemis}/tools/ExportJournal.java | 0 .../activemq/artemis}/tools/ImportJournal.java | 0 .../org/apache/activemq/artemis}/tools/Main.java | 0 .../apache/activemq/artemis}/tools/PrintData.java | 0 .../apache/activemq/artemis}/tools/PrintPages.java | 0 .../activemq/artemis}/tools/TransferQueue.java | 0 .../activemq/artemis}/tools/XmlDataConstants.java | 0 .../activemq/artemis}/tools/XmlDataExporter.java | 0 .../activemq/artemis}/tools/XmlDataImporter.java | 0 {activemq-web => artemis-web}/pom.xml | 0 .../artemis}/component/WebServerComponent.java | 0 .../artemis}/test/WebServerComponentTest.java | 0 .../resources/webapps/WebServerComponentTest.txt | 0 {activemq-website => artemis-website}/pom.xml | 0 .../src/main/resources/examples/index.html | 0 .../src/main/resources/images/activemq-logo.png | Bin .../src/main/resources/index.html | 0 .../main/resources/styles/impact/css/pygmentize.css | 0 .../src/main/resources/styles/impact/css/site.css | 0 .../src/main/resources/user-manual/index.html | 0 distribution/{activemq => artemis}/pom.xml | 0 .../{activemq => artemis}/src/main/assembly/dep.xml | 0 .../src/main/assembly/source-assembly.xml | 0 .../src/main/resources/README.html | 0 .../src/main/resources/bin/activemq | 0 .../src/main/resources/bin/activemq.cmd | 0 .../src/main/resources/licenses/bin/LICENSE | 0 .../src/main/resources/licenses/bin/NOTICE | 0 .../core/example/EmbeddedRemoteExample.java | 0 .../{ => artemis}/core/example/EmbeddedServer.java | 0 .../{ => artemis}/core/example/EmbeddedExample.java | 0 .../{ => artemis}/core/example/PerfBase.java | 0 .../{ => artemis}/core/example/PerfListener.java | 0 .../{ => artemis}/core/example/PerfParams.java | 0 .../{ => artemis}/core/example/PerfSender.java | 0 .../{ => artemis}/core/example/ExampleVerticle.java | 0 .../core/example/VertxConnectorExample.java | 0 .../{ => artemis}/jms/example/AerogearExample.java | 0 .../example/ApplicationLayerFailoverExample.java | 0 .../common.css | 0 .../config/logging.properties | 0 .../config/server.properties | 0 .../pom.xml | 0 .../prettify.css | 0 .../prettify.js | 0 .../artemis}/common/example/ActiveMQExample.java | 0 .../activemq/artemis}/common/example/DummyXid.java | 0 .../jms/{activemq-ra-rar => artemis-ra-rar}/pom.xml | 0 .../src/main/resources/ra.xml | 0 .../{ => artemis}/jms/example/BridgeExample.java | 0 .../jms/example/HatColourChangeTransformer.java | 0 .../jms/example/QueueBrowserExample.java | 0 .../jms/example/ClientKickoffExample.java | 0 .../example/ClientSideFailoverListerExample.java | 0 .../jms/example/ClientSideLoadBalancingExample.java | 0 .../ClusteredDurableSubscriptionExample.java | 0 .../jms/example/ClusteredGroupingExample.java | 0 .../jms/example/ClusteredJgroupsExample.java | 0 .../jms/example/ClusteredQueueExample.java | 0 .../jms/example/ClusteredStandaloneExample.java | 0 .../jms/example/StaticClusteredQueueExample.java | 0 .../jms/example/ClusterStaticOnewayExample.java | 0 .../jms/example/ClusteredTopicExample.java | 0 .../example/ColocatedFailoverScaleDownExample.java | 0 .../jms/example/ColocatedFailoverExample.java | 0 .../jms/example/ConsumerRateLimitExample.java | 0 .../jms/example/DeadLetterExample.java | 0 .../jms/example/DelayedRedeliveryExample.java | 0 .../jms/example/AddForwardingTimeTransformer.java | 0 .../{ => artemis}/jms/example/DivertExample.java | 0 .../jms/example/DurableSubscriptionExample.java | 0 .../{ => artemis}/jms/example/EmbeddedExample.java | 0 .../{ => artemis}/jms/example/EmbeddedExample.java | 0 .../{ => artemis}/jms/example/ExpiryExample.java | 0 .../jms/example/HAPolicyAutoBackupExample.java | 0 .../jms/example/HttpTransportExample.java | 0 .../InstantiateConnectionFactoryExample.java | 0 .../jms/example/InterceptorExample.java | 0 .../jms/example/SimpleInterceptor.java | 0 .../jms/example/JMSAutoCloseableExample.java | 0 .../{ => artemis}/jms/example/JMSBridgeExample.java | 0 .../jms/example/JMSCompletionListenerExample.java | 0 .../jms/example/JMSContextExample.java | 0 .../jms/example/JMSSharedConsumerExample.java | 0 .../{ => artemis}/jms/example/JMXExample.java | 0 .../jms/example/LargeMessageExample.java | 0 .../jms/example/LastValueQueueExample.java | 0 .../jms/example/ManagementNotificationExample.java | 0 .../jms/example/ManagementExample.java | 0 .../jms/example/MessageCounterExample.java | 0 .../jms/example/MessageGroupExample.java | 0 .../jms/example/MessageGroup2Example.java | 0 .../jms/example/MessagePriorityExample.java | 0 .../example/MultipleFailoverFailbackExample.java | 0 .../jms/example/MultipleFailoverExample.java | 0 .../jms/example/NoConsumerBufferingExample.java | 0 .../jms/example/NonTransactionFailoverExample.java | 0 .../{ => artemis}/jms/example/OpenWireExample.java | 0 .../{ => artemis}/jms/example/PagingExample.java | 0 .../{ => artemis}/jms/example/PerfBase.java | 0 .../{ => artemis}/jms/example/PerfListener.java | 0 .../{ => artemis}/jms/example/PerfParams.java | 0 .../{ => artemis}/jms/example/PerfSender.java | 0 .../jms/example/PreacknowledgeExample.java | 0 .../jms/example/ProducerRateLimitExample.java | 0 .../{ => artemis}/jms/example/ProtonCPPExample.java | 0 .../{ => artemis}/jms/example/ProtonJExample.java | 0 .../example/QueueMessageRedistributionExample.java | 0 .../jms/example/QueueRequestorExample.java | 0 .../jms/example/TextReverserService.java | 0 .../jms/example/QueueSelectorExample.java | 0 .../{ => artemis}/jms/example/QueueExample.java | 0 .../{ => artemis}/jms/example/ReattachExample.java | 0 .../example/ReplicatedFailbackStaticExample.java | 0 .../jms/example/ReplicatedFailbackExample.java | 0 .../example/ReplicatedMultipleFailoverExample.java | 0 .../ReplicatedTransactionFailoverExample.java | 0 .../jms/example/RequestReplyExample.java | 0 .../{ => artemis}/jms/example/ScaleDownExample.java | 0 .../jms/example/ScheduledMessageExample.java | 0 .../{ => artemis}/jms/example/SecurityExample.java | 0 .../jms/example/SendAcknowledgementsExample.java | 0 .../{ => artemis}/jms/example/ExampleListener.java | 0 .../{ => artemis}/jms/example/MessageSender.java | 0 .../{ => artemis}/jms/example/SpringExample.java | 0 .../{ => artemis}/jms/example/SSLExample.java | 0 .../jms/example/StaticSelectorJMSExample.java | 0 .../jms/example/StaticSelectorExample.java | 0 .../jms/example/StompWebSocketExample.java | 0 .../{ => artemis}/jms/example/StompExample.java | 0 .../{ => artemis}/jms/example/StompExample.java | 0 .../{ => artemis}/jms/example/StompExample.java | 0 .../jms/example/StopServerFailoverExample.java | 0 .../jms/example/SymmetricClusterExample.java | 0 .../jms/example/TemporaryQueueExample.java | 0 .../jms/example/TopicHierarchyExample.java | 0 .../jms/example/TopicSelectorExample1.java | 0 .../jms/example/TopicSelectorExample2.java | 0 .../{ => artemis}/jms/example/TopicExample.java | 0 .../jms/example/TransactionFailoverExample.java | 0 .../jms/example/TransactionalExample.java | 0 .../jms/example/XAHeuristicExample.java | 0 .../{ => artemis}/jms/example/XAReceiveExample.java | 0 .../{ => artemis}/jms/example/XASendExample.java | 0 .../{ => artemis}/jms/soak/example/SoakBase.java | 0 .../{ => artemis}/jms/soak/example/SoakParams.java | 0 .../jms/soak/example/SoakReceiver.java | 0 .../{ => artemis}/jms/soak/example/SoakSender.java | 0 .../aerogear/ActiveMQAeroGearBundle.java | 0 .../aerogear/ActiveMQAeroGearLogger.java | 0 .../aerogear/AeroGearConnectorService.java | 0 .../aerogear/AeroGearConnectorServiceFactory.java | 0 .../integration/aerogear/AeroGearConstants.java | 0 .../integration/spring/SpringBindingRegistry.java | 0 .../integration/spring/SpringJmsBootstrap.java | 0 .../{ => artemis}/spring/ActiveMQSpringBundle.java | 0 .../{ => artemis}/spring/ActiveMQSpringLogger.java | 0 .../integration/vertx/ActiveMQVertxLogger.java | 0 .../vertx/IncomingVertxEventHandler.java | 0 .../vertx/OutgoingVertxEventHandler.java | 0 .../integration/vertx/VertxConstants.java | 0 .../vertx/VertxIncomingConnectorServiceFactory.java | 0 .../vertx/VertxOutgoingConnectorServiceFactory.java | 0 .../tests/extras/ExtrasTestLogger.java | 0 .../extras/byteman/ActiveMQMessageHandlerTest.java | 0 .../tests/extras/byteman/BMFailoverTest.java | 0 .../BridgeServerLocatorConfigurationTest.java | 0 .../tests/extras/byteman/ClosingConnectionTest.java | 0 .../tests/extras/byteman/ClusteredGroupingTest.java | 0 .../tests/extras/byteman/GroupingTest.java | 0 .../byteman/HierarchicalObjectRepositoryTest.java | 0 .../extras/byteman/JMSBridgeReconnectionTest.java | 0 .../tests/extras/byteman/LatencyTest.java | 0 .../tests/extras/byteman/MessageCopyTest.java | 0 .../tests/extras/byteman/OrphanedConsumerTest.java | 0 .../tests/extras/byteman/PagingLeakTest.java | 0 .../tests/extras/byteman/ReplicationBackupTest.java | 0 .../tests/extras/byteman/ScaleDownFailoverTest.java | 0 .../tests/extras/byteman/ScaleDownFailureTest.java | 0 .../byteman/ScaleDownGroupedFailoverTest.java | 0 .../extras/byteman/ScaleDownGroupedFailureTest.java | 0 .../tests/extras/byteman/StartStopDeadlockTest.java | 0 .../extras/byteman/StompInternalStateTest.java | 0 .../tests/extras/jms/bridge/BridgeTestBase.java | 0 .../extras/jms/bridge/ClusteredBridgeTestBase.java | 0 .../extras/jms/bridge/JMSBridgeClusteredTest.java | 0 .../jms/bridge/JMSBridgeReconnectionTest.java | 0 .../tests/extras/jms/bridge/JMSBridgeTest.java | 0 .../jms/bridge/TransactionManagerLocatorImpl.java | 0 .../tests/extras/jms/xa/JMSXDeliveryCountTest.java | 0 .../{ => artemis}/tests/extras/jms/xa/XATest.java | 0 .../tests/integration/DuplicateDetectionTest.java | 0 .../tests/integration/IntegrationTestLogger.java | 0 .../tests/integration/InterceptorTest.java | 0 .../integration/SimpleNotificationService.java | 0 .../tests/integration/String64KLimitTest.java | 0 .../aerogear/AeroGearBasicServerTest.java | 0 .../tests/integration/client/AckBatchSizeTest.java | 0 .../tests/integration/client/AcknowledgeTest.java | 0 .../tests/integration/client/ActiveMQCrashTest.java | 0 .../integration/client/AddressSettingsTest.java | 0 .../tests/integration/client/AutoCloseCoreTest.java | 0 .../integration/client/AutoCreateJmsQueueTest.java | 0 .../integration/client/AutoDeleteJmsQueueTest.java | 0 .../tests/integration/client/AutogroupIdTest.java | 0 .../tests/integration/client/BlockingSendTest.java | 0 .../integration/client/CommitRollbackTest.java | 0 .../client/ConcurrentCreateDeleteProduceTest.java | 0 .../tests/integration/client/ConsumerCloseTest.java | 0 .../integration/client/ConsumerFilterTest.java | 0 .../integration/client/ConsumerRoundRobinTest.java | 0 .../tests/integration/client/ConsumerStuckTest.java | 0 .../tests/integration/client/ConsumerTest.java | 0 .../integration/client/ConsumerWindowSizeTest.java | 0 .../tests/integration/client/CoreClientTest.java | 0 .../client/CreateQueueIdempotentTest.java | 0 .../integration/client/DeadLetterAddressTest.java | 0 .../tests/integration/client/DeliveryOrderTest.java | 0 .../tests/integration/client/DurableQueueTest.java | 0 .../integration/client/ExpireTestOnRestartTest.java | 0 .../tests/integration/client/ExpiryAddressTest.java | 0 .../integration/client/ExpiryLargeMessageTest.java | 0 .../integration/client/FailureDeadlockTest.java | 0 .../FlowControlOnIgnoreLargeMessageBodyTest.java | 0 .../tests/integration/client/HangConsumerTest.java | 0 .../tests/integration/client/HeuristicXATest.java | 0 .../client/InVMNonPersistentMessageBufferTest.java | 0 .../client/InVMPersistentMessageBufferTest.java | 0 .../integration/client/IncompatibleVersionTest.java | 0 .../client/InterruptedLargeMessageTest.java | 0 .../integration/client/JMSMessageCounterTest.java | 0 .../integration/client/JMSPagingFileDeleteTest.java | 0 .../integration/client/JmsNettyNioStressTest.java | 0 .../tests/integration/client/JournalCrashTest.java | 0 .../client/LargeMessageAvoidLargeMessagesTest.java | 0 .../client/LargeMessageCompressTest.java | 0 .../tests/integration/client/LargeMessageTest.java | 0 .../client/LibaioDependencyCheckTest.java | 0 .../integration/client/MessageConcurrencyTest.java | 0 .../client/MessageConsumerRollbackTest.java | 0 .../integration/client/MessageCounterTest.java | 0 .../integration/client/MessageDurabilityTest.java | 0 .../integration/client/MessageExpirationTest.java | 0 .../MessageGroupingConnectionFactoryTest.java | 0 .../integration/client/MessageGroupingTest.java | 0 .../integration/client/MessageHandlerTest.java | 0 .../integration/client/MessagePriorityTest.java | 0 .../tests/integration/client/MessageRateTest.java | 0 .../client/MultipleThreadFilterOneTest.java | 0 .../tests/integration/client/NIOvsOIOTest.java | 0 .../integration/client/NettyConnectorTest.java | 0 .../client/NettyConsumerWindowSizeTest.java | 0 .../client/NettyNonPersistentMessageBufferTest.java | 0 .../client/NettyPersistentMessageBufferTest.java | 0 .../client/NettyProducerFlowControlTest.java | 0 .../client/NewDeadLetterAddressTest.java | 0 .../tests/integration/client/OrderTest.java | 0 .../tests/integration/client/PagingOrderTest.java | 0 .../tests/integration/client/PagingSyncTest.java | 0 .../tests/integration/client/PagingTest.java | 0 .../tests/integration/client/ProducerCloseTest.java | 0 .../integration/client/ProducerFlowControlTest.java | 0 .../tests/integration/client/ProducerTest.java | 0 .../tests/integration/client/QueueBrowserTest.java | 0 .../integration/client/ReceiveImmediateTest.java | 0 .../tests/integration/client/ReceiveTest.java | 0 .../integration/client/RedeliveryConsumerTest.java | 0 .../tests/integration/client/RequestorTest.java | 0 .../tests/integration/client/RoutingTest.java | 0 .../integration/client/SelfExpandingBufferTest.java | 0 .../client/ServerLocatorConnectTest.java | 0 .../integration/client/SessionCloseOnGCTest.java | 0 .../tests/integration/client/SessionCloseTest.java | 0 ...essionClosedOnRemotingConnectionFailureTest.java | 0 .../client/SessionCreateAndDeleteQueueTest.java | 0 .../client/SessionCreateConsumerTest.java | 0 .../client/SessionCreateProducerTest.java | 0 .../integration/client/SessionFactoryTest.java | 0 .../SessionSendAcknowledgementHandlerTest.java | 0 .../integration/client/SessionStopStartTest.java | 0 .../tests/integration/client/SessionTest.java | 0 .../client/SimpleSendMultipleQueuesTest.java | 0 .../tests/integration/client/SlowConsumerTest.java | 0 .../integration/client/TemporaryQueueTest.java | 0 .../client/TransactionDurabilityTest.java | 0 .../integration/client/TransactionalSendTest.java | 0 .../integration/client/TransientQueueTest.java | 0 .../integration/client/WildCardRoutingTest.java | 0 .../integration/clientcrash/ClientCrashTest.java | 0 .../integration/clientcrash/ClientExitTest.java | 0 .../integration/clientcrash/ClientTestBase.java | 0 .../tests/integration/clientcrash/CrashClient.java | 0 .../tests/integration/clientcrash/CrashClient2.java | 0 .../integration/clientcrash/DummyInterceptor.java | 0 .../integration/clientcrash/DummyInterceptorB.java | 0 .../integration/clientcrash/GracefulClient.java | 0 .../integration/cluster/ClusterControllerTest.java | 0 .../integration/cluster/NodeManagerAction.java | 0 .../tests/integration/cluster/NodeManagerTest.java | 0 .../integration/cluster/RealNodeManagerTest.java | 0 .../cluster/bridge/BridgeFailoverTest.java | 0 .../cluster/bridge/BridgeReconnectTest.java | 0 .../integration/cluster/bridge/BridgeStartTest.java | 0 .../integration/cluster/bridge/BridgeTest.java | 0 .../integration/cluster/bridge/BridgeTestBase.java | 0 .../bridge/BridgeWithDiscoveryGroupStartTest.java | 0 .../cluster/bridge/SimpleTransformer.java | 0 .../distribution/ClusterHeadersRemovedTest.java | 0 .../cluster/distribution/ClusterTestBase.java | 0 .../cluster/distribution/ClusterWithBackupTest.java | 0 .../cluster/distribution/ClusteredGroupingTest.java | 0 .../distribution/ClusteredRequestResponseTest.java | 0 .../LargeMessageRedistributionTest.java | 0 .../distribution/MessageRedistributionTest.java | 0 .../MessageRedistributionWithDiscoveryTest.java | 0 .../NettyFileStorageSymmetricClusterTest.java | 0 ...tyFileStorageSymmetricClusterWithBackupTest.java | 0 ...ileStorageSymmetricClusterWithDiscoveryTest.java | 0 .../distribution/NettyOneWayChainClusterTest.java | 0 .../distribution/NettyOneWayTwoNodeClusterTest.java | 0 .../distribution/NettySymmetricClusterTest.java | 0 .../NettySymmetricClusterWithBackupTest.java | 0 .../NettySymmetricClusterWithDiscoveryTest.java | 0 .../distribution/OneWayChainClusterTest.java | 0 .../distribution/OnewayTwoNodeClusterTest.java | 0 .../distribution/SimpleSymmetricClusterTest.java | 0 .../cluster/distribution/SymmetricClusterTest.java | 0 .../SymmetricClusterWithBackupTest.java | 0 .../SymmetricClusterWithDiscoveryTest.java | 0 .../distribution/TemporaryQueueClusterTest.java | 0 .../distribution/TwoWayTwoNodeClusterTest.java | 0 .../TwoWayTwoNodeClusterWithDiscoveryTest.java | 0 .../AlmostLargeAsynchronousFailoverTest.java | 0 .../cluster/failover/AsynchronousFailoverTest.java | 0 .../failover/AutomaticColocatedQuorumVoteTest.java | 0 .../cluster/failover/BackupAuthenticationTest.java | 0 .../cluster/failover/BackupSyncJournalTest.java | 0 .../failover/BackupSyncLargeMessageTest.java | 0 .../cluster/failover/BackupSyncPagingTest.java | 0 .../failover/ClusterWithBackupFailoverTestBase.java | 0 .../cluster/failover/DelayInterceptor.java | 0 .../cluster/failover/DelayInterceptor2.java | 0 .../cluster/failover/DelayInterceptor3.java | 0 .../DiscoveryClusterWithBackupFailoverTest.java | 0 .../cluster/failover/FailBackAutoTest.java | 0 .../cluster/failover/FailBackManualTest.java | 0 .../cluster/failover/FailoverListenerTest.java | 0 .../cluster/failover/FailoverOnFlowControlTest.java | 0 .../integration/cluster/failover/FailoverTest.java | 0 .../cluster/failover/FailoverTestBase.java | 0 .../failover/GroupingFailoverReplicationTest.java | 0 .../failover/GroupingFailoverSharedServerTest.java | 0 .../cluster/failover/GroupingFailoverTestBase.java | 0 .../cluster/failover/LargeMessageFailoverTest.java | 0 .../cluster/failover/LiveToLiveFailoverTest.java | 0 .../failover/MultipleBackupsFailoverTestBase.java | 0 .../MultipleLivesMultipleBackupsFailoverTest.java | 0 .../failover/MultipleServerFailoverTestBase.java | 0 .../failover/NettyAsynchronousFailoverTest.java | 0 .../failover/NettyAsynchronousReattachTest.java | 0 ...NettyDiscoveryClusterWithBackupFailoverTest.java | 0 .../cluster/failover/NettyFailoverTest.java | 0 ...orageDiscoveryClusterWithBackupFailoverTest.java | 0 ...eStorageStaticClusterWithBackupFailoverTest.java | 0 .../failover/NettyReplicatedFailoverTest.java | 0 .../NettyStaticClusterWithBackupFailoverTest.java | 0 .../cluster/failover/PagingFailoverTest.java | 0 .../cluster/failover/QuorumFailOverTest.java | 0 .../failover/QuorumVoteServerConnectTest.java | 0 .../ReplicatedAsynchronousFailoverTest.java | 0 .../failover/ReplicatedDistributionTest.java | 0 .../cluster/failover/ReplicatedFailoverTest.java | 0 .../ReplicatedFailoverUsingNodeGroupNameTest.java | 0 .../ReplicatedLargeMessageFailoverTest.java | 0 ...ReplicatedLargeMessageWithDelayFailoverTest.java | 0 ...nyMultipleServerFailoverNoNodeGroupNameTest.java | 0 .../ReplicatedManyMultipleServerFailoverTest.java | 0 ...catedMultipleServerFailoverExtraBackupsTest.java | 0 ...edMultipleServerFailoverNoGroupNodeNameTest.java | 0 .../ReplicatedMultipleServerFailoverTest.java | 0 .../ReplicatedNettyAsynchronousFailoverTest.java | 0 .../failover/ReplicatedPagedFailoverTest.java | 0 .../failover/ReplicatedPagingFailoverTest.java | 0 .../failover/ReplicatedWithDelayFailoverTest.java | 0 .../cluster/failover/SecurityFailoverTest.java | 0 .../failover/SharedStoreDistributionTest.java | 0 .../SingleLiveMultipleBackupsFailoverTest.java | 0 .../StaticClusterWithBackupFailoverTest.java | 0 .../remote/FailoverWithSharedStoreTest.java | 0 .../cluster/ha/HAAutomaticBackupSharedStore.java | 0 .../reattach/MultiThreadRandomReattachTest.java | 0 .../reattach/MultiThreadRandomReattachTestBase.java | 0 .../MultiThreadReattachSupportTestBase.java | 0 .../NettyMultiThreadRandomReattachTest.java | 0 .../cluster/reattach/OrderReattachTest.java | 0 .../cluster/reattach/RandomReattachTest.java | 0 .../integration/cluster/reattach/ReattachTest.java | 0 .../cluster/restart/ClusterRestartTest.java | 0 .../cluster/topology/HAClientTopologyTest.java | 0 .../topology/HAClientTopologyWithDiscoveryTest.java | 0 .../cluster/topology/IsolatedTopologyTest.java | 0 .../cluster/topology/NettyHAClientTopologyTest.java | 0 .../NettyHAClientTopologyWithDiscoveryTest.java | 0 .../cluster/topology/NonHATopologyTest.java | 0 .../cluster/topology/TopologyClusterTestBase.java | 0 .../integration/cluster/util/BackupSyncDelay.java | 0 .../cluster/util/MultiServerTestBase.java | 0 .../cluster/util/RemoteServerConfiguration.java | 0 .../cluster/util/SameProcessActiveMQServer.java | 0 .../integration/cluster/util/TestableServer.java | 0 .../integration/discovery/DiscoveryBaseTest.java | 0 .../discovery/DiscoveryStayAliveTest.java | 0 .../tests/integration/discovery/DiscoveryTest.java | 0 .../tests/integration/divert/DivertTest.java | 0 .../integration/divert/PersistentDivertTest.java | 0 .../tests/integration/embedded/ValidateAIOTest.java | 0 .../integration/http/CoreClientOverHttpTest.java | 0 .../jms/ActiveMQConnectionFactoryTest.java | 0 .../tests/integration/jms/FloodServerTest.java | 0 .../tests/integration/jms/JMSSecurityTest.java | 0 .../tests/integration/jms/JmsProducerTest.java | 0 .../jms/ManualReconnectionToSingleServerTest.java | 0 .../tests/integration/jms/SimpleJNDIClientTest.java | 0 .../integration/jms/client/AutoGroupingTest.java | 0 .../integration/jms/client/ConnectionTest.java | 0 .../integration/jms/client/CreateQueueTest.java | 0 .../integration/jms/client/ExpiryMessageTest.java | 0 .../tests/integration/jms/client/GroupIDTest.java | 0 .../tests/integration/jms/client/GroupingTest.java | 0 .../integration/jms/client/MessageProducerTest.java | 0 .../tests/integration/jms/client/MessageTest.java | 0 .../jms/client/NewQueueRequestorTest.java | 0 .../jms/client/NoLocalSubscriberTest.java | 0 .../tests/integration/jms/client/PreACKJMSTest.java | 0 .../integration/jms/client/ReSendMessageTest.java | 0 .../integration/jms/client/ReceiveNoWaitTest.java | 0 .../jms/client/RemoteConnectionStressTest.java | 0 ...essionClosedOnRemotingConnectionFailureTest.java | 0 .../tests/integration/jms/client/SessionTest.java | 0 .../integration/jms/client/StoreConfigTest.java | 0 .../integration/jms/client/TextMessageTest.java | 0 .../integration/jms/client/TopicCleanupTest.java | 0 .../jms/cluster/BindingsClusterTest.java | 0 .../jms/cluster/JMSFailoverListenerTest.java | 0 .../integration/jms/cluster/JMSFailoverTest.java | 0 .../integration/jms/cluster/JMSReconnectTest.java | 0 .../jms/cluster/LargeMessageOverBridgeTest.java | 0 .../jms/cluster/MultipleThreadsOpeningTest.java | 0 .../jms/cluster/ReplicatedJMSFailoverTest.java | 0 .../jms/cluster/TemporaryQueueClusterTest.java | 0 .../integration/jms/cluster/TopicClusterTest.java | 0 .../connection/CloseConnectionFactoryOnGCest.java | 0 .../jms/connection/CloseConnectionOnGCTest.java | 0 .../connection/CloseDestroyedConnectionTest.java | 0 .../jms/connection/ConcurrentSessionCloseTest.java | 0 .../ConnectionFactorySerializationTest.java | 0 ...nnectionFactoryWithJGroupsSerializationTest.java | 0 .../jms/connection/ExceptionListenerTest.java | 0 .../jms/connection/InvalidConnectorTest.java | 0 .../integration/jms/consumer/ConsumerTest.java | 0 .../jms/divert/DivertAndACKClientTest.java | 0 .../tests/integration/jms/jms2client/BodyTest.java | 0 .../jms/jms2client/InvalidDestinationTest.java | 0 .../integration/jms/jms2client/JmsContextTest.java | 0 .../JmsProducerCompletionListenerTest.java | 0 .../jms/jms2client/NonExistentQueueTest.java | 0 .../jms/jms2client/SharedConsumerTest.java | 0 .../jms/largemessage/JMSLargeMessageTest.java | 0 .../jms/server/JMSServerDeployerTest.java | 0 .../jms/server/JMSServerStartStopTest.java | 0 .../jms/server/config/JMSConfigurationTest.java | 0 .../server/config/JMSServerConfigParserTest.java | 0 .../management/ConnectionFactoryControlTest.java | 0 .../jms/server/management/JMSMessagingProxy.java | 0 .../jms/server/management/JMSQueueControlTest.java | 0 .../management/JMSQueueControlUsingJMSTest.java | 0 .../server/management/JMSServerControl2Test.java | 0 .../management/JMSServerControlRestartTest.java | 0 .../jms/server/management/JMSServerControlTest.java | 0 .../management/JMSServerControlUsingJMSTest.java | 0 .../integration/jms/server/management/JMSUtil.java | 0 .../jms/server/management/NullInitialContext.java | 0 .../server/management/TopicControlClusterTest.java | 0 .../jms/server/management/TopicControlTest.java | 0 .../server/management/TopicControlUsingJMSTest.java | 0 .../integration/journal/AIOImportExportTest.java | 0 .../integration/journal/AIOJournalCompactTest.java | 0 .../integration/journal/AIOJournalImplTest.java | 0 .../journal/AIOSequentialFileFactoryTest.java | 0 .../integration/journal/JournalPerfTuneTest.java | 0 .../journal/NIOBufferedJournalCompactTest.java | 0 .../integration/journal/NIOImportExportTest.java | 0 .../integration/journal/NIOJournalCompactTest.java | 0 .../integration/journal/NIOJournalImplTest.java | 0 .../journal/NIONoBufferJournalImplTest.java | 0 .../NIONonBufferedSequentialFileFactoryTest.java | 0 .../journal/NIOSequentialFileFactoryTest.java | 0 .../tests/integration/journal/OldFormatTest.java | 0 .../journal/ValidateTransactionHealthTest.java | 0 .../largemessage/LargeMessageTestBase.java | 0 .../largemessage/ServerLargeMessageTest.java | 0 .../integration/management/AcceptorControlTest.java | 0 .../management/AcceptorControlUsingCoreTest.java | 0 .../management/ActiveMQServerControlTest.java | 0 .../ActiveMQServerControlUsingCoreTest.java | 0 .../integration/management/AddressControlTest.java | 0 .../management/AddressControlUsingCoreTest.java | 0 .../integration/management/BridgeControlTest.java | 0 .../management/BridgeControlUsingCoreTest.java | 0 .../management/BroadcastGroupControlTest.java | 0 .../BroadcastGroupControlUsingCoreTest.java | 0 .../management/ClusterConnectionControl2Test.java | 0 .../management/ClusterConnectionControlTest.java | 0 .../ClusterConnectionControlUsingCoreTest.java | 0 .../integration/management/CoreMessagingProxy.java | 0 .../integration/management/DivertControlTest.java | 0 .../management/DivertControlUsingCoreTest.java | 0 .../tests/integration/management/JMXDomainTest.java | 0 .../management/ManagementActivationTest.java | 0 .../management/ManagementControlHelper.java | 0 .../management/ManagementHelperTest.java | 0 .../management/ManagementServiceImplTest.java | 0 .../integration/management/ManagementTestBase.java | 0 .../management/ManagementWithPagingServerTest.java | 0 .../management/ManagementWithStompTest.java | 0 .../integration/management/NotificationTest.java | 0 .../integration/management/QueueControlTest.java | 0 .../management/QueueControlUsingCoreTest.java | 0 .../management/SecurityManagementTestBase.java | 0 ...curityManagementWithConfiguredAdminUserTest.java | 0 ...urityManagementWithDefaultConfigurationTest.java | 0 ...rityManagementWithModifiedConfigurationTest.java | 0 .../management/SecurityNotificationTest.java | 0 .../integration/openwire/BasicOpenWireTest.java | 0 .../integration/openwire/BasicSecurityTest.java | 0 .../integration/openwire/OpenWireTestBase.java | 0 .../integration/openwire/OpenWireUtilTest.java | 0 .../integration/openwire/SimpleOpenWireTest.java | 0 .../integration/openwire/amq/JMSConsumer10Test.java | 0 .../integration/openwire/amq/JMSConsumer11Test.java | 0 .../integration/openwire/amq/JMSConsumer12Test.java | 0 .../integration/openwire/amq/JMSConsumer13Test.java | 0 .../integration/openwire/amq/JMSConsumer1Test.java | 0 .../integration/openwire/amq/JMSConsumer2Test.java | 0 .../integration/openwire/amq/JMSConsumer3Test.java | 0 .../integration/openwire/amq/JMSConsumer4Test.java | 0 .../integration/openwire/amq/JMSConsumer5Test.java | 0 .../integration/openwire/amq/JMSConsumer6Test.java | 0 .../integration/openwire/amq/JMSConsumer7Test.java | 0 .../integration/openwire/amq/JMSConsumer8Test.java | 0 .../integration/openwire/amq/JMSConsumer9Test.java | 0 .../openwire/amq/JMSDurableTopicRedeliverTest.java | 0 .../openwire/amq/JMSIndividualAckTest.java | 0 .../integration/openwire/amq/JMSMessageTest.java | 0 .../openwire/amq/JMSQueueRedeliverTest.java | 0 .../integration/openwire/amq/JMSUsecase1Test.java | 0 .../integration/openwire/amq/JMSUsecaseTest.java | 0 .../openwire/amq/JmsAutoAckListenerTest.java | 0 .../integration/openwire/amq/JmsAutoAckTest.java | 0 .../integration/openwire/amq/JmsClientAckTest.java | 0 .../openwire/amq/JmsConnectionStartStopTest.java | 0 .../amq/JmsConsumerResetActiveListenerTest.java | 0 .../amq/JmsCreateConsumerInOnMessageTest.java | 0 .../amq/JmsDurableQueueWildcardSendReceiveTest.java | 0 .../openwire/amq/JmsDurableTopicSelectorTest.java | 0 .../amq/JmsDurableTopicSendReceiveTest.java | 0 .../amq/JmsDurableTopicTransactionTest.java | 0 .../amq/JmsDurableTopicWildcardSendReceiveTest.java | 0 .../openwire/amq/JmsQueueBrowserTest.java | 0 .../openwire/amq/JmsQueueRequestReplyTest.java | 0 .../openwire/amq/JmsResourceProvider.java | 0 .../openwire/amq/JmsSendReceiveTestSupport.java | 0 .../openwire/amq/JmsTopicRedeliverTest.java | 0 .../openwire/amq/JmsTopicRequestReplyTest.java | 0 .../openwire/amq/JmsTopicSelectorTest.java | 0 .../openwire/amq/JmsTopicSendReceiveTest.java | 0 .../JmsTopicSendReceiveWithTwoConnectionsTest.java | 0 .../openwire/amq/JmsTopicTransactionTest.java | 0 .../amq/JmsTopicWildcardSendReceiveTest.java | 0 .../openwire/amq/JmsTransactionTestSupport.java | 0 .../openwire/amq/MessageListenerRedeliveryTest.java | 0 .../amq/ProducerFlowControlSendFailTest.java | 0 .../openwire/amq/ProducerFlowControlTest.java | 0 .../openwire/amq/ReconnectWithSameClientIDTest.java | 0 .../openwire/amq/RedeliveryPolicyTest.java | 0 .../integration/openwire/amq/TimeStampTest.java | 0 .../openwire/amq/TransactionContextTest.java | 0 .../openwire/interop/GeneralInteropTest.java | 0 .../tests/integration/openwire/util/Wait.java | 0 .../paging/MultipleProducersPagingTest.java | 0 .../integration/paging/NettyPagingSendTest.java | 0 .../paging/PageCountSyncOnNonTXTest.java | 0 .../integration/paging/PageCountSyncServer.java | 0 .../tests/integration/paging/PagingCounterTest.java | 0 .../tests/integration/paging/PagingReceiveTest.java | 0 .../tests/integration/paging/PagingSendTest.java | 0 .../paging/PagingWithFailoverAndCountersTest.java | 0 .../paging/PagingWithFailoverBackup.java | 0 .../paging/PagingWithFailoverServer.java | 0 .../integration/paging/SpawnedServerSupport.java | 0 .../AddressSettingsConfigurationStorageTest.java | 0 .../persistence/DeleteMessagesOnStartupTest.java | 0 .../persistence/DeleteQueueRestartTest.java | 0 .../integration/persistence/DuplicateCacheTest.java | 0 .../integration/persistence/ExportFormatTest.java | 0 ...MSConnectionFactoryConfigurationStorageTest.java | 0 .../persistence/JMSDynamicConfigTest.java | 0 .../persistence/JMSStorageManagerTest.java | 0 .../integration/persistence/RestartSMTest.java | 0 .../persistence/RolesConfigurationStorageTest.java | 0 .../persistence/StorageManagerTestBase.java | 0 .../TransportConfigurationEncodingSupportTest.java | 0 .../persistence/XmlImportExportTest.java | 0 .../tests/integration/proton/ProtonTest.java | 0 .../integration/ra/ActiveMQActivationTest.java | 0 .../tests/integration/ra/ActiveMQClusteredTest.java | 0 .../ra/ActiveMQMessageHandlerSecurityTest.java | 0 .../integration/ra/ActiveMQMessageHandlerTest.java | 0 .../ra/ActiveMQMessageHandlerXATest.java | 0 .../integration/ra/ActiveMQRAClusteredTestBase.java | 0 .../tests/integration/ra/ActiveMQRATestBase.java | 0 .../tests/integration/ra/DummyTransaction.java | 0 .../integration/ra/DummyTransactionManager.java | 0 .../tests/integration/ra/JMSContextTest.java | 0 .../integration/ra/OutgoingConnectionTest.java | 0 .../integration/ra/OutgoingConnectionTestJTA.java | 0 .../tests/integration/ra/ResourceAdapterTest.java | 0 .../tests/integration/remoting/BatchDelayTest.java | 0 .../integration/remoting/DestroyConsumerTest.java | 0 .../integration/remoting/DirectDeliverTest.java | 0 .../remoting/NettyNetworkAddressTest.java | 0 .../remoting/NettySynchronousCloseTest.java | 0 .../remoting/NetworkAddressTestBase.java | 0 .../tests/integration/remoting/PingTest.java | 0 .../tests/integration/remoting/ReconnectTest.java | 0 .../integration/remoting/SynchronousCloseTest.java | 0 .../replication/ReplicationOrderTest.java | 0 .../integration/replication/ReplicationTest.java | 0 .../integration/scheduling/DelayedMessageTest.java | 0 .../scheduling/MultipliedDelayedMessageTest.java | 0 .../scheduling/ScheduledMessageTest.java | 0 .../security/NettySecurityClientTest.java | 0 .../tests/integration/security/SecurityTest.java | 0 .../tests/integration/security/SimpleClient.java | 0 .../integration/server/AIOFileLockTimeoutTest.java | 0 .../integration/server/AddressFullLoggingTest.java | 0 .../tests/integration/server/ExpiryRunnerTest.java | 0 .../integration/server/FakeStorageManager.java | 0 .../integration/server/FileLockTimeoutTest.java | 0 .../integration/server/GracefulShutdownTest.java | 0 .../tests/integration/server/LVQRecoveryTest.java | 0 .../tests/integration/server/LVQTest.java | 0 .../integration/server/NIOFileLockTimeoutTest.java | 0 .../integration/server/PredefinedQueueTest.java | 0 .../integration/server/ScaleDown3NodeTest.java | 0 .../integration/server/ScaleDownDirectTest.java | 0 .../tests/integration/server/ScaleDownTest.java | 0 .../integration/server/SimpleStartStopTest.java | 0 .../integration/server/SuppliedThreadPoolTest.java | 0 .../tests/integration/spring/ExampleListener.java | 0 .../tests/integration/spring/MessageSender.java | 0 .../integration/spring/SpringIntegrationTest.java | 0 .../ssl/CoreClientOverOneWaySSLTest.java | 0 .../ssl/CoreClientOverTwoWaySSLTest.java | 0 .../integration/stomp/ConcurrentStompTest.java | 0 .../tests/integration/stomp/ExtraStompTest.java | 0 .../stomp/StompConnectionCleanupTest.java | 0 .../tests/integration/stomp/StompOverHttpTest.java | 0 .../integration/stomp/StompOverWebsocketTest.java | 0 .../tests/integration/stomp/StompTest.java | 0 .../tests/integration/stomp/StompTestBase.java | 0 .../tests/integration/stomp/StompWebSocketTest.java | 0 .../stomp/util/AbstractClientStompFrame.java | 0 .../stomp/util/AbstractStompClientConnection.java | 0 .../integration/stomp/util/ClientStompFrame.java | 0 .../integration/stomp/util/ClientStompFrameV10.java | 0 .../integration/stomp/util/ClientStompFrameV11.java | 0 .../integration/stomp/util/ClientStompFrameV12.java | 0 .../stomp/util/StompClientConnection.java | 0 .../stomp/util/StompClientConnectionFactory.java | 0 .../stomp/util/StompClientConnectionV10.java | 0 .../stomp/util/StompClientConnectionV11.java | 0 .../stomp/util/StompClientConnectionV12.java | 0 .../integration/stomp/util/StompFrameFactory.java | 0 .../stomp/util/StompFrameFactoryFactory.java | 0 .../stomp/util/StompFrameFactoryV10.java | 0 .../stomp/util/StompFrameFactoryV11.java | 0 .../stomp/util/StompFrameFactoryV12.java | 0 .../tests/integration/stomp/v11/ExtraStompTest.java | 0 .../tests/integration/stomp/v11/StompV11Test.java | 0 .../integration/stomp/v11/StompV11TestBase.java | 0 .../tests/integration/stomp/v12/StompV12Test.java | 0 .../integration/tools/TransferMessageTest.java | 0 .../transports/netty/ActiveMQFrameDecoder2Test.java | 0 .../netty/NettyConnectorWithHTTPUpgradeTest.java | 0 .../integration/vertx/ActiveMQVertxUnitTest.java | 0 .../tests/integration/xa/BasicXaRecoveryTest.java | 0 .../tests/integration/xa/BasicXaTest.java | 0 .../tests/integration/xa/XaTimeoutTest.java | 0 .../tests/util/JMSClusteredTestBase.java | 0 .../{ => artemis}/tests/util/JMSTestBase.java | 0 .../{ => artemis}/tests/util/JournalExample.java | 0 .../tests/util/NonSerializableFactory.java | 0 .../tests/util/ReplicatedBackupUtils.java | 0 .../tests/util/TransportConfigurationUtils.java | 0 .../DummyTransactionManagerLocator.java | 0 .../transactions/TransactionManagerLocatorTest.java | 0 .../jms/tests/AcknowledgementTest.java | 0 .../jms/tests/ActiveMQServerTestCase.java | 0 .../jms/tests/AutoAckMesageListenerTest.java | 0 .../{ => artemis}/jms/tests/BrowserTest.java | 0 .../jms/tests/CTSMiscellaneousTest.java | 0 .../jms/tests/ConnectionClosedTest.java | 0 .../jms/tests/ConnectionFactoryTest.java | 0 .../{ => artemis}/jms/tests/ConnectionTest.java | 0 .../{ => artemis}/jms/tests/ConsumerClosedTest.java | 0 .../{ => artemis}/jms/tests/DeliveryOrderTest.java | 0 .../jms/tests/DurableSubscriptionTest.java | 0 .../activemq/{ => artemis}/jms/tests/JMSTest.java | 0 .../{ => artemis}/jms/tests/JMSTestCase.java | 0 .../{ => artemis}/jms/tests/JmsTestLogger.java | 0 .../jms/tests/MessageConsumerTest.java | 0 .../jms/tests/MessageProducerTest.java | 0 .../jms/tests/MessageWithReadResolveTest.java | 0 .../{ => artemis}/jms/tests/MiscellaneousTest.java | 0 .../jms/tests/NonDurableSubscriberTest.java | 0 .../{ => artemis}/jms/tests/PersistenceTest.java | 0 .../{ => artemis}/jms/tests/QueueReceiverTest.java | 0 .../activemq/{ => artemis}/jms/tests/QueueTest.java | 0 .../{ => artemis}/jms/tests/ReferenceableTest.java | 0 .../{ => artemis}/jms/tests/SecurityTest.java | 0 .../{ => artemis}/jms/tests/SessionTest.java | 0 .../jms/tests/TemporaryDestinationTest.java | 0 .../activemq/{ => artemis}/jms/tests/TopicTest.java | 0 .../jms/tests/TransactedSessionTest.java | 0 .../jms/tests/message/BodyIsAssignableFromTest.java | 0 .../jms/tests/message/BytesMessageTest.java | 0 .../jms/tests/message/ExpiredMessageTest.java | 0 .../tests/message/JMSCorrelationIDHeaderTest.java | 0 .../tests/message/JMSDeliveryModeHeaderTest.java | 0 .../jms/tests/message/JMSDestinationHeaderTest.java | 0 .../jms/tests/message/JMSExpirationHeaderTest.java | 0 .../jms/tests/message/JMSMessageIDHeaderTest.java | 0 .../jms/tests/message/JMSPriorityHeaderTest.java | 0 .../jms/tests/message/JMSReplyToHeaderTest.java | 0 .../jms/tests/message/JMSTimestampHeaderTest.java | 0 .../jms/tests/message/JMSTypeHeaderTest.java | 0 .../jms/tests/message/MapMessageTest.java | 0 .../jms/tests/message/MessageBodyTest.java | 0 .../jms/tests/message/MessageBodyTestCase.java | 0 .../jms/tests/message/MessageHeaderTest.java | 0 .../jms/tests/message/MessageHeaderTestBase.java | 0 .../message/MessagePropertyConversionTest.java | 0 .../jms/tests/message/MessageTestBase.java | 0 .../tests/message/ObjectMessageDeliveryTest.java | 0 .../jms/tests/message/ObjectMessageTest.java | 0 .../jms/tests/message/SimpleJMSBytesMessage.java | 0 .../jms/tests/message/SimpleJMSMapMessage.java | 0 .../jms/tests/message/SimpleJMSMessage.java | 0 .../jms/tests/message/SimpleJMSObjectMessage.java | 0 .../jms/tests/message/SimpleJMSStreamMessage.java | 0 .../jms/tests/message/SimpleJMSTextMessage.java | 0 .../{ => artemis}/jms/tests/message/SomeObject.java | 0 .../jms/tests/message/StreamMessageTest.java | 0 .../jms/tests/message/TextMessageTest.java | 0 .../message/foreign/ForeignBytesMessageTest.java | 0 .../message/foreign/ForeignMapMessageTest.java | 0 .../tests/message/foreign/ForeignMessageTest.java | 0 .../message/foreign/ForeignObjectMessageTest.java | 0 .../message/foreign/ForeignStreamMessageTest.java | 0 .../tests/message/foreign/ForeignTestObject.java | 0 .../message/foreign/ForeignTextMessageTest.java | 0 .../jms/tests/selector/SelectorTest.java | 0 .../jms/tests/tools/ServerManagement.java | 0 .../jms/tests/tools/container/Constants.java | 0 .../jms/tests/tools/container/InVMContext.java | 0 .../tools/container/InVMInitialContextFactory.java | 0 .../container/InVMInitialContextFactoryBuilder.java | 0 .../jms/tests/tools/container/InVMNameParser.java | 0 .../jms/tests/tools/container/LocalTestServer.java | 0 .../tools/container/NonSerializableFactory.java | 0 .../jms/tests/tools/container/Server.java | 0 .../{ => artemis}/jms/tests/util/JNDIUtilTest.java | 0 .../jms/tests/util/ProxyAssertSupport.java | 0 .../activemq/{ => artemis}/jms/AbstractAdmin.java | 0 .../activemq/{ => artemis}/jms/ActiveMQAdmin.java | 0 .../activemq/{ => artemis}/jms/GenericAdmin.java | 0 .../{ => artemis}/jms/JoramAggregationTest.java | 0 .../{ => artemis}/jms/SpawnedJMSServer.java | 0 .../performance/journal/FakeJournalImplTest.java | 0 .../performance/journal/JournalImplTestUnit.java | 0 .../performance/journal/RealJournalImplAIOTest.java | 0 .../performance/journal/RealJournalImplNIOTest.java | 0 .../paging/MeasurePagingMultiThreadTest.java | 0 .../sends/AbstractSendReceivePerfTest.java | 0 .../tests/performance/sends/ClientACKPerf.java | 0 .../performance/sends/MeasureCommitPerfTest.java | 0 .../tests/performance/sends/PreACKPerf.java | 0 .../tests/soak/client/ClientAbstract.java | 0 .../soak/client/ClientNonDivertedSoakTest.java | 0 .../tests/soak/client/ClientSoakTest.java | 0 .../{ => artemis}/tests/soak/client/Receiver.java | 0 .../{ => artemis}/tests/soak/client/Sender.java | 0 .../soak/client/SimpleSendReceiveSoakTest.java | 0 .../tests/soak/failover/RandomFailoverSoakTest.java | 0 .../tests/stress/chunk/LargeMessageStressTest.java | 0 .../tests/stress/client/SendStressTest.java | 0 .../MultiThreadRandomReattachStressTest.java | 0 .../stress/failover/RandomReattachStressTest.java | 0 .../AIOAllPossibilitiesCompactStressTest.java | 0 .../journal/AIOMultiThreadCompactorStressTest.java | 0 .../stress/journal/AddAndRemoveStressTest.java | 0 .../journal/AllPossibilitiesCompactStressTest.java | 0 ...PossibilitiesCompactWithAddDeleteStressTest.java | 0 .../tests/stress/journal/CompactingStressTest.java | 0 .../journal/JournalCleanupCompactStressTest.java | 0 .../stress/journal/JournalRestartStressTest.java | 0 .../stress/journal/LargeJournalStressTest.java | 0 .../stress/journal/MixupCompactorTestBase.java | 0 .../journal/MultiThreadConsumerStressTest.java | 0 .../journal/NIOMultiThreadCompactorStressTest.java | 0 .../stress/journal/XmlImportExportStressTest.java | 0 .../paging/MultipleConsumersPageStressTest.java | 0 .../tests/stress/paging/PageCursorStressTest.java | 0 .../tests/stress/paging/PageStressTest.java | 0 .../tests/stress/remote/PingStressTest.java | 0 .../tests/stress/stomp/StompStressTest.java | 0 .../core/journal/impl/AIOJournalImplTest.java | 0 .../core/journal/impl/FakeJournalImplTest.java | 0 .../core/journal/impl/JournalImplTestUnit.java | 0 .../core/journal/impl/NIOJournalImplTest.java | 0 .../core/server/impl/QueueConcurrentTest.java | 0 .../timing/core/server/impl/QueueImplTest.java | 0 .../timing/jms/bridge/impl/JMSBridgeImplTest.java | 0 .../tests/timing/util/ReusableLatchTest.java | 0 .../timing/util/TokenBucketLimiterImplTest.java | 0 .../{ => artemis}/tests/timing/util/UTF8Test.java | 0 .../{ => artemis}/tests/timing/util/UUIDTest.java | 0 .../{ => artemis}/tests/unit/UnitTestLogger.java | 0 .../tests/unit/core/asyncio/AIOTestBase.java | 0 .../unit/core/asyncio/AsynchronousFileTest.java | 0 .../asyncio/MultiThreadAsynchronousFileTest.java | 0 .../core/client/impl/LargeMessageBufferTest.java | 0 .../config/impl/ConfigurationValidationTest.java | 0 .../core/config/impl/ConnectorsServiceTest.java | 0 .../config/impl/TransportConfigurationTest.java | 0 .../config/impl/fakes/FakeConnectorService.java | 0 .../impl/fakes/FakeConnectorServiceFactory.java | 0 .../core/journal/impl/AlignedJournalImplTest.java | 0 .../unit/core/journal/impl/CleanBufferTest.java | 0 .../unit/core/journal/impl/FakeJournalImplTest.java | 0 .../journal/impl/FakeSequentialFileFactoryTest.java | 0 .../unit/core/journal/impl/FileFactoryTestBase.java | 0 .../unit/core/journal/impl/JournalAsyncTest.java | 0 .../unit/core/journal/impl/JournalImplTestBase.java | 0 .../unit/core/journal/impl/JournalImplTestUnit.java | 0 .../tests/unit/core/journal/impl/ReclaimerTest.java | 0 .../journal/impl/SequentialFileFactoryTestBase.java | 0 .../unit/core/journal/impl/TimedBufferTest.java | 0 .../impl/fakes/FakeSequentialFileFactory.java | 0 .../core/journal/impl/fakes/SimpleEncoding.java | 0 .../unit/core/message/impl/MessageImplTest.java | 0 .../unit/core/paging/impl/PagePositionTest.java | 0 .../tests/unit/core/paging/impl/PageTest.java | 0 .../core/paging/impl/PagingManagerImplTest.java | 0 .../unit/core/paging/impl/PagingStoreImplTest.java | 0 .../persistence/impl/BatchIDGeneratorUnitTest.java | 0 .../persistence/impl/OperationContextUnitTest.java | 0 .../unit/core/postoffice/impl/AddressImplTest.java | 0 .../unit/core/postoffice/impl/BindingsImplTest.java | 0 .../postoffice/impl/DuplicateDetectionUnitTest.java | 0 .../tests/unit/core/postoffice/impl/FakeQueue.java | 0 .../core/postoffice/impl/QueueComparatorTest.java | 0 .../impl/WildcardAddressManagerUnitTest.java | 0 .../unit/core/remoting/ActiveMQBufferTestBase.java | 0 .../impl/invm/InVMConnectorFactoryTest.java | 0 .../impl/netty/ChannelBufferWrapper2Test.java | 0 .../impl/netty/NettyAcceptorFactoryTest.java | 0 .../core/remoting/impl/netty/NettyAcceptorTest.java | 0 .../remoting/impl/netty/NettyConnectionTest.java | 0 .../impl/netty/NettyConnectorFactoryTest.java | 0 .../remoting/impl/netty/NettyConnectorTest.java | 0 .../unit/core/remoting/impl/ssl/SSLSupportTest.java | 0 .../server/impl/RemotingServiceImplTest.java | 0 .../remoting/server/impl/fake/FakeInterceptor.java | 0 .../impl/ActiveMQSecurityManagerImplTest.java | 0 .../cluster/impl/ClusterConnectionBridgeTest.java | 0 .../cluster/impl/RemoteQueueBindImplTest.java | 0 .../group/impl/SystemPropertyOverrideTest.java | 0 .../tests/unit/core/server/impl/FileLockTest.java | 0 .../tests/unit/core/server/impl/QueueImplTest.java | 0 .../unit/core/server/impl/fakes/FakeConsumer.java | 0 .../unit/core/server/impl/fakes/FakeFilter.java | 0 .../core/server/impl/fakes/FakeJournalLoader.java | 0 .../unit/core/server/impl/fakes/FakePostOffice.java | 0 .../core/server/impl/fakes/FakeQueueFactory.java | 0 .../tests/unit/jms/ActiveMQDestinationTest.java | 0 .../unit/jms/client/ActiveMQMapMessageTest.java | 0 .../unit/jms/client/ActiveMQStreamMessageTest.java | 0 .../unit/jms/client/JMSExceptionHelperTest.java | 0 .../unit/jms/client/SelectorTranslatorTest.java | 0 .../tests/unit/jms/misc/ManifestTest.java | 0 .../ConnectionFactoryObjectFactoryTest.java | 0 .../referenceable/DestinationObjectFactoryTest.java | 0 .../unit/ra/ActiveMQResourceAdapterConfigTest.java | 0 .../tests/unit/ra/BootstrapContext.java | 0 .../unit/ra/ConnectionFactoryPropertiesTest.java | 0 .../tests/unit/ra/MessageEndpointFactory.java | 0 .../tests/unit/ra/ResourceAdapterTest.java | 0 .../unit/util/ActiveMQBufferInputStreamTest.java | 0 .../tests/unit/util/FakePagingManager.java | 0 .../{ => artemis}/tests/unit/util/InVMContext.java | 0 .../tests/unit/util/InVMNameParser.java | 0 .../tests/unit/util/InVMNamingContext.java | 0 .../tests/unit/util/LinkedListTest.java | 0 .../tests/unit/util/MemorySizeTest.java | 0 .../tests/unit/util/NonSerializableFactory.java | 0 .../util/ObjectInputStreamWithClassLoaderTest.java | 0 .../tests/unit/util/ReusableLatchTest.java | 0 .../tests/unit/util/SoftValueMapTest.java | 0 .../{ => artemis}/tests/unit/util/UTF8Test.java | 0 .../tests/unit/util/UUIDGeneratorTest.java | 0 .../{ => artemis}/tests/unit/util/UUIDTest.java | 0 .../tests/unit/util/VersionLoaderTest.java | 0 .../{ => artemis}/tests/util/CreateMessage.java | 0 .../{ => artemis}/tests/util/SpawnedVMSupport.java | 0 2264 files changed, 0 insertions(+), 0 deletions(-) rename {activemq-boot => artemis-boot}/pom.xml (100%) rename {activemq-boot/src/main/java/org/apache/activemq => artemis-boot/src/main/java/org/apache/activemq/artemis}/boot/ActiveMQ.java (100%) rename {activemq-bootstrap => artemis-bootstrap}/pom.xml (100%) rename {activemq-bootstrap/src/main/filtered-resources/org/apache/activemq => artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis}/cli/banner.txt (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/cli/ActiveMQ.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/cli/ConfigurationException.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/cli/commands/Action.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/cli/commands/ActionContext.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/cli/commands/Create.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/cli/commands/HelpAction.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/cli/commands/Run.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/cli/commands/Stop.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/components/ExternalComponent.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/factory/BasicSecurityHandler.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/factory/BrokerFactory.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/factory/BrokerFactoryHandler.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/factory/BrokerHandler.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/factory/FileBrokerHandler.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/factory/SecurityHandler.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/factory/SecurityManagerFactory.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/factory/XmlBrokerFactoryHandler.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/integration/Broker.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/integration/FileBroker.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/integration/bootstrap/ActiveMQBootstrapBundle.java (100%) rename {activemq-bootstrap/src/main/java/org/apache/activemq => artemis-bootstrap/src/main/java/org/apache/activemq/artemis}/integration/bootstrap/ActiveMQBootstrapLogger.java (100%) rename {activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq => artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis}/broker/security/basic-security (100%) rename {activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq => artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis}/broker/server/file (100%) rename {activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq => artemis-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/artemis}/broker/xml (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/bin/activemq (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/bin/activemq-service (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/bin/activemq-service.xml (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/bin/activemq.cmd (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/etc/activemq-configuration.xml (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/etc/activemq-roles.properties (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/etc/activemq-users.properties (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/etc/activemq.profile (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/etc/activemq.profile.cmd (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/etc/bootstrap.xml (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/etc/cluster-settings.txt (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/etc/logging.properties (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/etc/replicated-settings.txt (100%) rename {activemq-bootstrap/src/main/resources/org/apache/activemq => artemis-bootstrap/src/main/resources/org/apache/activemq/artemis}/cli/commands/etc/shared-store-settings.txt (100%) rename {activemq-bootstrap/src/test/java/org/apache/activemq => artemis-bootstrap/src/test/java/org/apache/activemq/artemis}/test/FileBrokerTest.java (100%) rename {activemq-bootstrap => artemis-bootstrap}/src/test/resources/activemq-configuration-nojms.xml (100%) rename {activemq-bootstrap => artemis-bootstrap}/src/test/resources/activemq-configuration.xml (100%) rename {activemq-commons => artemis-commons}/pom.xml (100%) rename {activemq-commons => artemis-commons}/src/main/appended-resources/META-INF/LICENSE (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQAddressExistsException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQAddressFullException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQAlreadyReplicatingException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQBuffer.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQBuffers.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQClusterSecurityException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQConnectionTimedOutException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQDisconnectedException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQDuplicateIdException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQDuplicateMetaDataException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQExceptionType.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQIOErrorException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQIllegalStateException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQIncompatibleClientServerException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQInterceptorRejectedPacketException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQInternalErrorException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQInterruptedException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQInvalidFilterExpressionException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQInvalidTransientQueueUseException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQLargeMessageException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQLargeMessageInterruptedException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQNativeIOError.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQNonExistentQueueException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQNotConnectedException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQObjectClosedException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQPropertyConversionException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQQueueExistsException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQSecurityException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQSessionCreationException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQTransactionOutcomeUnknownException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQTransactionRolledBackException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQUnBlockedException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/ActiveMQUnsupportedPacketException.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/Pair.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/api/core/SimpleString.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/core/buffers/impl/ChannelBufferWrapper.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/core/server/ActiveMQComponent.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/logs/ActiveMQUtilBundle.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/logs/ActiveMQUtilLogger.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/logs/AssertionLoggerHandler.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/ActiveMQThreadFactory.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/Base64.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/ByteUtil.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/ClassloadingUtil.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/ConcurrentHashSet.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/ConcurrentSet.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/DataConstants.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/DefaultSensitiveStringCodec.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/FactoryFinder.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/PasswordMaskingUtil.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/ReferenceCounter.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/ReferenceCounterUtil.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/ReusableLatch.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/SensitiveDataCodec.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/TypedProperties.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/UTF8Util.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/UUID.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/UUIDGenerator.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/UUIDTimer.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/uri/SchemaConstants.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/uri/URIFactory.java (100%) rename {activemq-commons/src/main/java/org/apache/activemq => artemis-commons/src/main/java/org/apache/activemq/artemis}/utils/uri/URISchema.java (100%) rename {activemq-commons/src/test/java/org/apache/activemq => artemis-commons/src/test/java/org/apache/activemq/artemis}/utils/ByteUtilTest.java (100%) rename {activemq-commons/src/test/java/org/apache/activemq => artemis-commons/src/test/java/org/apache/activemq/artemis}/utils/PairTest.java (100%) rename {activemq-commons/src/test/java/org/apache/activemq => artemis-commons/src/test/java/org/apache/activemq/artemis}/utils/ReferenceCounterTest.java (100%) rename {activemq-commons/src/test/java/org/apache/activemq => artemis-commons/src/test/java/org/apache/activemq/artemis}/utils/URIParserTest.java (100%) rename {activemq-core-client => artemis-core-client}/pom.xml (100%) rename {activemq-core-client => artemis-core-client}/src/main/appended-resources/META-INF/LICENSE (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/config/ActiveMQDefaultConfiguration.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/BaseInterceptor.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/BroadcastEndpoint.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/BroadcastEndpointFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/BroadcastGroupConfiguration.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/ChannelBroadcastEndpointFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/DiscoveryGroupConfiguration.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/FilterConstants.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/Interceptor.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/JGroupsBroadcastEndpoint.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/JGroupsChannelBroadcastEndpoint.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/JGroupsFileBroadcastEndpoint.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/JGroupsFileBroadcastEndpointFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/JGroupsPropertiesBroadcastEndpoint.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/JGroupsPropertiesBroadcastEndpointFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/Message.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/TransportConfiguration.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/TransportConfigurationHelper.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/UDPBroadcastEndpointFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/ActiveMQClient.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/ClientConsumer.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/ClientMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/ClientProducer.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/ClientRequestor.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/ClientSession.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/ClientSessionFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/ClusterTopologyListener.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/FailoverEventListener.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/FailoverEventType.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/MessageHandler.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/SendAcknowledgementHandler.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/ServerLocator.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/SessionFailureListener.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/TopologyMember.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/loadbalance/package-info.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/client/package-info.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/AcceptorControl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/ActiveMQComponentControl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/ActiveMQServerControl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/AddressControl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/AddressSettingsInfo.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/BridgeControl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/BroadcastGroupControl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/ClusterConnectionControl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/CoreNotificationType.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/DayCounterInfo.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/DivertControl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/ManagementHelper.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/NotificationType.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/ObjectNameBuilder.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/Operation.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/Parameter.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/QueueControl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/ResourceNames.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/RoleInfo.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/management/package-info.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/api/core/package-info.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/ActiveMQClientLogger.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/ActiveMQClientMessageBundle.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ActiveMQXAResource.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/AddressQueryImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/AfterConnectInternalListener.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientConsumerImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientConsumerInternal.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientLargeMessageImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientLargeMessageInternal.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientMessageImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientMessageInternal.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientProducerCreditManager.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientProducerCreditManagerImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientProducerCredits.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientProducerCreditsImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientProducerImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientProducerInternal.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientSessionFactoryImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientSessionFactoryInternal.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientSessionImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ClientSessionInternal.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/CompressedLargeMessageControllerImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/DelegatingSession.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/LargeMessageController.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/LargeMessageControllerImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/QueueQueryImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ServerLocatorImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/ServerLocatorInternal.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/Topology.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/client/impl/TopologyMemberImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/cluster/DiscoveryEntry.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/cluster/DiscoveryGroup.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/cluster/DiscoveryListener.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/exception/ActiveMQXAException.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/message/BodyEncoder.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/message/impl/MessageImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/message/impl/MessageInternal.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/ClientPacketDecoder.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/Channel.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/ChannelHandler.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/CommandConfirmationHandler.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/CoreRemotingConnection.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/Packet.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/ActiveMQClientProtocolManager.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/ActiveMQConsumerContext.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/ActiveMQSessionContext.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/BackwardsCompatibilityUtils.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/ChannelImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/PacketDecoder.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/PacketImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/RemotingConnectionImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/CheckFailoverMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/CreateQueueMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/CreateSessionMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/DisconnectMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/MessagePacket.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/NullResponseMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/Ping.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReattachSessionMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/RollbackMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionCloseMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionCommitMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionContinuationMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionExpireMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionReceiveMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionSendMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXACommitMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXAEndMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SessionXAStartMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/CloseListener.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/FailureListener.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/TransportConfigurationUtil.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/ActiveMQAMQPFrameDecoder.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/ActiveMQChannelHandler.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/ActiveMQFrameDecoder2.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/NettyConnection.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/NettyConnector.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/NettyConnectorFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/PartialPooledByteBufAllocator.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/SharedNioEventLoopGroup.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/TransportConstants.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/ssl/SSLSupport.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/remoting/package-info.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/security/ActiveMQPrincipal.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/security/Role.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/server/QueueQueryResult.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/server/management/Notification.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/server/management/NotificationListener.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/server/management/NotificationService.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/settings/impl/AddressFullMessagePolicy.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/transaction/impl/XidImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/version/Version.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/core/version/impl/VersionImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/reader/BytesMessageUtil.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/reader/MapMessageUtil.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/reader/MessageUtil.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/reader/StreamMessageUtil.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/reader/TextMessageUtil.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/reader/package-info.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/protocol/AbstractRemotingConnection.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/protocol/ConnectionEntry.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/protocol/RemotingConnection.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/AbstractConnector.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/BufferDecoder.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/BufferHandler.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/ClientProtocolManager.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/ClientProtocolManagerFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/Connection.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/ConnectionLifeCycleListener.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/Connector.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/ConnectorFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/ConsumerContext.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/ReadyListener.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/SessionContext.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/TopologyResponseHandler.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/package-info.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/uri/AbstractServerLocatorSchema.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/uri/AbstractTransportConfigurationSchema.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/uri/ConnectionOptions.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/uri/ConnectorTransportConfigurationParser.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/uri/InVMServerLocatorSchema.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/uri/InVMTransportConfigurationSchema.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/uri/JGroupsServerLocatorSchema.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/uri/ServerLocatorParser.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/uri/TCPServerLocatorSchema.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/uri/TCPTransportConfigurationSchema.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/uri/UDPServerLocatorSchema.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/ActiveMQBufferInputStream.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/BufferHelper.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/ConfigurationHelper.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/ConfirmationWindowWarning.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/DeflaterReader.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/ExecutorFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/FutureLatch.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/IDGenerator.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/InflaterReader.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/InflaterWriter.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/JNDIUtil.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/LinkedList.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/LinkedListImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/LinkedListIterator.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/MemorySize.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/ObjectInputStreamWithClassLoader.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/OrderedExecutorFactory.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/PriorityLinkedList.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/PriorityLinkedListImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/Random.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/SecurityFormatter.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/SimpleIDGenerator.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/SizeFormatterUtil.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/SoftValueHashMap.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/TimeAndCounterIDGenerator.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/TokenBucketLimiter.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/TokenBucketLimiterImpl.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/VersionLoader.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/XMLUtil.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/XidCodecSupport.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/json/JSONArray.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/json/JSONException.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/json/JSONObject.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/json/JSONString.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/json/JSONTokener.java (100%) rename {activemq-core-client/src/main/java/org/apache/activemq => artemis-core-client/src/main/java/org/apache/activemq/artemis}/utils/package-info.java (100%) rename {activemq-core-client => artemis-core-client}/src/main/resources/activemq-version.properties (100%) rename {activemq-core-client/src/test/java/org/apache/activemq => artemis-core-client/src/test/java/org/apache/activemq/artemis}/tests/CoreUnitTestCase.java (100%) rename {activemq-core-client/src/test/java/org/apache/activemq => artemis-core-client/src/test/java/org/apache/activemq/artemis}/tests/util/RandomUtil.java (100%) rename {activemq-core-client/src/test/java/org/apache/activemq => artemis-core-client/src/test/java/org/apache/activemq/artemis}/tests/util/SilentTestCase.java (100%) rename {activemq-core-client/src/test/java/org/apache/activemq => artemis-core-client/src/test/java/org/apache/activemq/artemis}/util/CompressionUtilTest.java (100%) rename {activemq-core-client/src/test/java/org/apache/activemq => artemis-core-client/src/test/java/org/apache/activemq/artemis}/util/ConcurrentHashSetTest.java (100%) rename {activemq-core-client/src/test/java/org/apache/activemq => artemis-core-client/src/test/java/org/apache/activemq/artemis}/util/TimeAndCounterIDGeneratorTest.java (100%) rename {activemq-core-client/src/test/java/org/apache/activemq => artemis-core-client/src/test/java/org/apache/activemq/artemis}/util/TypedPropertiesConversionTest.java (100%) rename {activemq-core-client/src/test/java/org/apache/activemq => artemis-core-client/src/test/java/org/apache/activemq/artemis}/util/TypedPropertiesTest.java (100%) rename {activemq-core-client/src/test/java/org/apache/activemq => artemis-core-client/src/test/java/org/apache/activemq/artemis}/util/XMLUtilTest.java (100%) rename {activemq-dto => artemis-dto}/pom.xml (100%) rename {activemq-dto/src/main/java/org/apache/activemq => artemis-dto/src/main/java/org/apache/activemq/artemis}/dto/AppDTO.java (100%) rename {activemq-dto/src/main/java/org/apache/activemq => artemis-dto/src/main/java/org/apache/activemq/artemis}/dto/BasicSecurityDTO.java (100%) rename {activemq-dto/src/main/java/org/apache/activemq => artemis-dto/src/main/java/org/apache/activemq/artemis}/dto/BrokerDTO.java (100%) rename {activemq-dto/src/main/java/org/apache/activemq => artemis-dto/src/main/java/org/apache/activemq/artemis}/dto/ComponentDTO.java (100%) rename {activemq-dto/src/main/java/org/apache/activemq => artemis-dto/src/main/java/org/apache/activemq/artemis}/dto/SecurityDTO.java (100%) rename {activemq-dto/src/main/java/org/apache/activemq => artemis-dto/src/main/java/org/apache/activemq/artemis}/dto/ServerDTO.java (100%) rename {activemq-dto/src/main/java/org/apache/activemq => artemis-dto/src/main/java/org/apache/activemq/artemis}/dto/WebServerDTO.java (100%) rename {activemq-dto/src/main/java/org/apache/activemq => artemis-dto/src/main/java/org/apache/activemq/artemis}/dto/XmlUtil.java (100%) rename {activemq-dto/src/main/java/org/apache/activemq => artemis-dto/src/main/java/org/apache/activemq/artemis}/dto/package-info.java (100%) rename {activemq-dto/src/main/resources/org/apache/activemq => artemis-dto/src/main/resources/org/apache/activemq/artemis}/dto/jaxb.index (100%) rename {activemq-jms-client => artemis-jms-client}/pom.xml (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/ActiveMQJMSClient.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/ActiveMQJMSConstants.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/JMSFactoryType.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/management/ConnectionFactoryControl.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/management/DestinationControl.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/management/JMSConnectionInfo.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/management/JMSConsumerInfo.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/management/JMSManagementHelper.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/management/JMSQueueControl.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/management/JMSServerControl.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/management/JMSSessionInfo.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/management/SubscriptionInfo.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/management/TopicControl.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/management/package-info.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/api/jms/package-info.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQBytesMessage.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQConnection.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQConnectionFactory.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQConnectionForContext.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQConnectionForContextImpl.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQConnectionMetaData.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQDestination.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQJMSClientBundle.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQJMSClientLogger.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQJMSConnectionFactory.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQJMSConsumer.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQJMSContext.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQJMSProducer.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQMapMessage.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQMessage.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQMessageConsumer.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQMessageProducer.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQObjectMessage.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQQueue.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQQueueBrowser.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQQueueConnectionFactory.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQSession.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQStreamMessage.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQTemporaryQueue.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQTemporaryTopic.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQTextMessage.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQTopic.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQTopicConnectionFactory.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQXAConnection.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQXAConnectionFactory.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQXAJMSContext.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQXAQueueConnectionFactory.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQXASession.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ActiveMQXATopicConnectionFactory.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/JMSExceptionHelper.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/JMSMessageListenerWrapper.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/JmsExceptionUtils.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/SelectorTranslator.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/ThreadAwareContext.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/client/package-info.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/referenceable/ConnectionFactoryObjectFactory.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/referenceable/DestinationObjectFactory.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jms/referenceable/SerializableObjectRefAddr.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jndi/ActiveMQInitialContextFactory.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jndi/LazyCreateContext.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jndi/NameParserImpl.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/jndi/ReadOnlyContext.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/uri/AbstractCFSchema.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/uri/ConnectionFactoryParser.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/uri/InVMSchema.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/uri/JGroupsSchema.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/uri/JMSConnectionOptions.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/uri/TCPSchema.java (100%) rename {activemq-jms-client/src/main/java/org/apache/activemq => artemis-jms-client/src/main/java/org/apache/activemq/artemis}/uri/UDPSchema.java (100%) rename {activemq-jms-client/src/test/java/org/apache/activemq => artemis-jms-client/src/test/java/org/apache/activemq/artemis}/uri/ConnectionFactoryURITest.java (100%) rename {activemq-jms-server => artemis-jms-server}/pom.xml (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/bridge/ActiveMQJMSBridgeLogger.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/bridge/ConnectionFactoryFactory.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/bridge/DestinationFactory.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/bridge/JMSBridge.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/bridge/JMSBridgeControl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/bridge/QualityOfServiceMode.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/bridge/impl/JMSBridgeControlImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/bridge/impl/JMSBridgeImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/bridge/impl/JNDIConnectionFactoryFactory.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/bridge/impl/JNDIDestinationFactory.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/bridge/impl/JNDIFactorySupport.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/management/impl/JMSConnectionFactoryControlImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/management/impl/JMSQueueControlImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/management/impl/JMSServerControlImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/management/impl/JMSTopicControlImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/persistence/JMSStorageManager.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/persistence/config/PersistedBindings.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/persistence/config/PersistedConnectionFactory.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/persistence/config/PersistedDestination.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/persistence/config/PersistedType.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/ActiveMQJMSServerBundle.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/ActiveMQJMSServerLogger.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/JMSServerConfigParser.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/JMSServerManager.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/config/ConnectionFactoryConfiguration.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/config/JMSConfiguration.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/config/JMSQueueConfiguration.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/config/TopicConfiguration.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/config/impl/FileJMSConfiguration.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/config/impl/JMSConfigurationImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/config/impl/JMSQueueConfigurationImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/config/impl/TopicConfigurationImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/config/impl/TransportConfigurationEncodingSupport.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/embedded/EmbeddedJMS.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/impl/JMSServerManagerImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/management/JMSManagementService.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/management/JMSNotificationType.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/server/management/impl/JMSManagementServiceImpl.java (100%) rename {activemq-jms-server/src/main/java/org/apache/activemq => artemis-jms-server/src/main/java/org/apache/activemq/artemis}/jms/transaction/JMSTransactionDetail.java (100%) rename {activemq-jms-server => artemis-jms-server}/src/main/resources/schema/activemq-jms.xsd (100%) rename {activemq-journal => artemis-journal}/pom.xml (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/asyncio/AIOCallback.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/asyncio/AsynchronousFile.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/asyncio/BufferCallback.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/asyncio/IOExceptionListener.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/asyncio/impl/ActiveMQFileLock.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/asyncio/impl/AsynchronousFileImpl.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/EncodingSupport.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/IOAsyncTask.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/IOCompletion.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/IOCriticalErrorListener.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/Journal.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/JournalLoadInformation.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/LoaderCallback.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/PreparedTransactionInfo.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/RecordInfo.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/SequentialFile.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/SequentialFileFactory.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/TestableJournal.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/TransactionFailureCallback.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/AIOSequentialFile.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/AIOSequentialFileFactory.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/AbstractJournalUpdateTask.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/AbstractSequentialFile.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/AbstractSequentialFileFactory.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/CompactJournal.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/DummyCallback.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/FileWrapperJournal.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalBase.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalCompactor.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalConstants.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalFile.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalFileImpl.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalFilesRepository.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalImpl.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalReaderCallback.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalReaderCallbackAbstract.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalRecord.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalRecordProvider.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/JournalTransaction.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/NIOSequentialFile.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/NIOSequentialFileFactory.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/Reclaimer.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/SimpleWaitIOCallback.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/SyncIOCompletion.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/SyncSpeedTest.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/TimedBuffer.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/TimedBufferObserver.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/TransactionCallback.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/dataformat/ByteArrayEncoding.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/dataformat/JournalAddRecord.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/dataformat/JournalAddRecordTX.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/dataformat/JournalCompleteRecordTX.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/dataformat/JournalDeleteRecord.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/dataformat/JournalDeleteRecordTX.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/dataformat/JournalInternalRecord.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/core/journal/impl/dataformat/JournalRollbackRecordTX.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/journal/ActiveMQJournalBundle.java (100%) rename {activemq-journal/src/main/java/org/apache/activemq => artemis-journal/src/main/java/org/apache/activemq/artemis}/journal/ActiveMQJournalLogger.java (100%) rename {activemq-maven-plugin => artemis-maven-plugin}/pom.xml (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/maven/ActiveMQClient.java (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/maven/ActiveMQClientPlugin.java (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/maven/ActiveMQStartPlugin.java (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/maven/ActiveMQStopPlugin.java (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/maven/InVMNodeManagerServer.java (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/maven/PluginUtil.java (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/maven/TestClusterManager.java (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/maven/TestClusterManagerMBean.java (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/maven/TestNode.java (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/server/ActiveMQBootstrap.java (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/server/SpawnedActiveMQBootstrap.java (100%) rename {activemq-maven-plugin/src/main/java/org/apache/activemq => artemis-maven-plugin/src/main/java/org/apache/activemq/artemis}/server/SpawnedVMSupport.java (100%) rename {activemq-native => artemis-native}/README (100%) rename {activemq-native => artemis-native}/bin/libactivemqAIO32.so (100%) rename {activemq-native => artemis-native}/bin/libactivemqAIO64.so (100%) rename {activemq-native => artemis-native}/compile-native.sh (100%) rename {activemq-native => artemis-native}/pom.xml (100%) rename {activemq-native => artemis-native}/src/main/c/AIOController.cpp (100%) rename {activemq-native => artemis-native}/src/main/c/AIOController.h (100%) rename {activemq-native => artemis-native}/src/main/c/AIOException.h (100%) rename {activemq-native => artemis-native}/src/main/c/AsyncFile.cpp (100%) rename {activemq-native => artemis-native}/src/main/c/AsyncFile.h (100%) rename {activemq-native => artemis-native}/src/main/c/CallbackAdapter.h (100%) rename {activemq-native => artemis-native}/src/main/c/JAIODatatypes.h (100%) rename {activemq-native => artemis-native}/src/main/c/JNICallbackAdapter.cpp (100%) rename {activemq-native => artemis-native}/src/main/c/JNICallbackAdapter.h (100%) rename {activemq-native => artemis-native}/src/main/c/JNI_AsynchronousFileImpl.cpp (100%) rename {activemq-native => artemis-native}/src/main/c/JavaUtilities.cpp (100%) rename {activemq-native => artemis-native}/src/main/c/JavaUtilities.h (100%) rename {activemq-native => artemis-native}/src/main/c/LockClass.h (100%) rename {activemq-native => artemis-native}/src/main/c/Version.h (100%) rename {activemq-native/src/main/java/org/apache/activemq => artemis-native/src/main/java/org/apache/activemq/artemis}/core/libaio/Native.java (100%) rename {activemq-protocols/activemq-amqp-protocol => artemis-protocols/artemis-amqp-protocol}/pom.xml (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/ActiveMQProtonRemotingConnection.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/ProtonProtocolManager.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/ProtonProtocolManagerFactory.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/converter/ActiveMQJMSVendor.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/converter/ProtonMessageConverter.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/converter/jms/ServerJMSMapMessage.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/converter/jms/ServerJMSMessage.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/converter/jms/ServerJMSTextMessage.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/converter/jms/package-info.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/plug/package-info.java (100%) rename {activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/proton/sasl/ActiveMQPlainSASL.java (100%) rename {activemq-protocols/activemq-amqp-protocol => artemis-protocols/artemis-amqp-protocol}/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory (100%) rename {activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq => artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis}/core/protocol/proton/TestConversions.java (100%) rename {activemq-protocols/activemq-openwire-protocol => artemis-protocols/artemis-openwire-protocol}/pom.xml (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/AMQConnectorImpl.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/AMQTransactionImpl.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/BrokerState.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/DataInputWrapper.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/NotEnoughBytesException.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/OpenWireConnection.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/OpenWireMessageConverter.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/OpenWireProtocolManager.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/OpenWireProtocolManagerFactory.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/OpenWireUtil.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/SendingResult.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQBrokerStoppedException.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQConnectionContext.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQConnector.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQConnectorStatistics.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQConsumer.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQDeadLetterStrategy.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQDestination.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQDestinationStatistics.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQMessageStore.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQPersistenceAdapter.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQProducer.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQProducerBrokerExchange.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQSecurityContext.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQServerConsumer.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQServerSession.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQServerSessionFactory.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQSession.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQSubscription.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQSubscriptionRecovery.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQTransaction.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQTransactionFactory.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQTransportConnectionState.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/BrowserListener.java (100%) rename {activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/openwire/amq/MessageInfo.java (100%) rename {activemq-protocols/activemq-openwire-protocol => artemis-protocols/artemis-openwire-protocol}/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/pom.xml (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/AMQPClientConnectionContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/AMQPClientReceiverContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/AMQPClientSenderContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/AMQPClientSessionContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/AMQPConnectionCallback.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/AMQPConnectionContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/AMQPConnectionContextFactory.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/AMQPServerConnectionContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/AMQPSessionCallback.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/AMQPSessionContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/ClientSASL.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/SASLResult.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/ServerSASL.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/AbstractConnectionContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/AbstractProtonReceiverContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/ProtonDeliveryHandler.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/ProtonInitializable.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/ProtonPlugSender.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/client/ProtonClientContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPException.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPIllegalStateException.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPInternalErrorException.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPInvalidFieldException.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPNotImplementedException.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/exceptions/ActiveMQAMQPTimeoutException.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/handler/EventHandler.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/handler/Events.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/handler/ProtonHandler.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/handler/impl/DefaultEventHandler.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/sasl/AnonymousServerSASL.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/sasl/PlainSASLResult.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/sasl/ServerSASLPlain.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/util/ByteUtil.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/util/CodecCache.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/util/CreditsSemaphore.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/util/DebugInfo.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/util/DeliveryUtil.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/util/FutureRunnable.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/util/NettyWritable.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/util/ProtonServerMessage.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/main/java/org/proton/plug/util/ReusableLatch.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/context/AbstractConnectionContextTest.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/AbstractJMSTest.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/Constants.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/ProtonTest.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/invm/InVMTestConnector.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/minimalclient/Connector.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/minimalserver/DumbServer.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/minimalserver/MinimalServer.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/sasl/PlainSASLTest.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/util/ReusableLatchTest.java (100%) rename {activemq-protocols/activemq-proton-plug => artemis-protocols/artemis-proton-plug}/src/test/java/org/proton/plug/test/util/SimpleServerAbstractTest.java (100%) rename {activemq-protocols/activemq-stomp-protocol => artemis-protocols/artemis-stomp-protocol}/pom.xml (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/ActiveMQStompException.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/ActiveMQStompProtocolLogger.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/FrameEventListener.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/SimpleBytes.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/Stomp.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/StompCommands.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/StompConnection.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/StompDecoder.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/StompFrame.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/StompFrameInterceptor.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/StompProtocolManager.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/StompProtocolManagerFactory.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/StompSession.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/StompSubscription.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/StompUtils.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/StompVersions.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/VersionedStompFrameHandler.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/v10/StompFrameHandlerV10.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/v10/StompFrameV10.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/v11/StompFrameHandlerV11.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/v11/StompFrameV11.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/v12/StompFrameHandlerV12.java (100%) rename {activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq => artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/v12/StompFrameV12.java (100%) rename {activemq-protocols/activemq-stomp-protocol => artemis-protocols/artemis-stomp-protocol}/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory (100%) rename {activemq-protocols => artemis-protocols}/pom.xml (100%) rename {activemq-ra => artemis-ra}/pom.xml (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRABundle.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRABytesMessage.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAConnectionFactory.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAConnectionFactoryImpl.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAConnectionManager.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAConnectionMetaData.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAConnectionRequestInfo.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRACredential.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAJMSContext.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRALocalTransaction.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRALogger.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAMCFProperties.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAManagedConnection.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAManagedConnectionFactory.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAMapMessage.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAMessage.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAMessageConsumer.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAMessageListener.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAMessageProducer.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAMetaData.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAObjectMessage.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAProperties.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAQueueReceiver.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAQueueSender.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAService.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRASession.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRASessionFactory.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRASessionFactoryImpl.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAStreamMessage.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRATextMessage.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRATopicPublisher.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRATopicSubscriber.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAXAJMSContext.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRAXAResource.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQRaUtils.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ActiveMQResourceAdapter.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/ConnectionFactoryProperties.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/inflow/ActiveMQActivation.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/inflow/ActiveMQActivationSpec.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/inflow/ActiveMQMessageHandler.java (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/package.html (100%) rename {activemq-ra/src/main/java/org/apache/activemq => artemis-ra/src/main/java/org/apache/activemq/artemis}/ra/recovery/RecoveryManager.java (100%) rename {activemq-rest => artemis-rest}/pom.xml (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/ActiveMQ.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/ActiveMQRestBundle.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/ActiveMQRestLogger.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/HttpHeaderProperty.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/Jms.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/MessageServiceConfiguration.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/MessageServiceManager.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/UnknownMediaType.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/UnmarshalException.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/integration/ActiveMQBootstrapListener.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/integration/EmbeddedRestActiveMQ.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/integration/EmbeddedRestActiveMQJMS.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/integration/RestMessagingBootstrapListener.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/integration/ServletContextBindingRegistry.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/AcknowledgedQueueConsumer.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/Acknowledgement.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/ConsumedHttpMessage.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/ConsumedMessage.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/ConsumedObjectMessage.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/ConsumersResource.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/DestinationResource.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/DestinationServiceManager.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/DestinationSettings.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/PostMessage.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/PostMessageDupsOk.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/PostMessageNoDups.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/QueueConsumer.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/QueueDeployment.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/QueueDestinationsResource.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/QueueResource.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/QueueServiceManager.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/ActiveMQPushStrategy.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/FilePushStore.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/PushConsumer.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/PushConsumerMessageHandler.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/PushConsumerResource.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/PushStore.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/PushStrategy.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/UriStrategy.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/UriTemplateStrategy.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/xml/Authentication.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/xml/AuthenticationType.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/xml/BasicAuth.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/xml/DigestAuth.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/xml/PushRegistration.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/xml/XmlHttpHeader.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/queue/push/xml/XmlLink.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/AcknowledgedSubscriptionResource.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/FileTopicPushStore.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/PushSubscription.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/PushSubscriptionsResource.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/PushTopicRegistration.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/Subscription.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/SubscriptionResource.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/SubscriptionsResource.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/TopicDeployment.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/TopicDestinationsResource.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/TopicPushStore.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/TopicResource.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/topic/TopicServiceManager.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/util/Constants.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/util/CustomHeaderLinkStrategy.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/util/HttpMessageHelper.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/util/LinkHeaderLinkStrategy.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/util/LinkStrategy.java (100%) rename {activemq-rest/src/main/java/org/apache/activemq => artemis-rest/src/main/java/org/apache/activemq/artemis}/rest/util/TimeoutTask.java (100%) rename {activemq-rest => artemis-rest}/src/main/resources/schema/hornetq-rest.xsd (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/AutoAckQueueTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/AutoAckTopicTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/ClientAckQueueTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/ClientAckTopicTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/CreateDestinationTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/DupQueueTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/Embedded.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/EmbeddedTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/FindDestinationTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/JMSTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/MessageTestBase.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/PersistentPushQueueConsumerTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/PersistentPushTopicConsumerTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/PushQueueConsumerTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/PushTopicConsumerTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/RawAckTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/RepostingQueueTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/RepostingTopicTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/RoundtripTimeTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/SelectorTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/SessionTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/TransformTest.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/Util.java (100%) rename {activemq-rest/src/test/java/org/apache/activemq => artemis-rest/src/test/java/org/apache/activemq/artemis}/rest/test/XmlTest.java (100%) rename {activemq-rest => artemis-rest}/src/test/resources/activemq-configuration.xml (100%) rename {activemq-rest => artemis-rest}/src/test/resources/activemq-rest.xml (100%) rename {activemq-rest => artemis-rest}/src/test/resources/activemq-roles.properties (100%) rename {activemq-rest => artemis-rest}/src/test/resources/activemq-users.properties (100%) rename {activemq-selector => artemis-selector}/pom.xml (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/ArithmeticExpression.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/BinaryExpression.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/BooleanExpression.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/ComparisonExpression.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/ConstantExpression.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/Expression.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/FilterException.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/Filterable.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/LogicExpression.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/PropertyExpression.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/UnaryExpression.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/XPathExpression.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/XQueryExpression.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/XalanXPathEvaluator.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/filter/package.html (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/impl/LRUCache.java (100%) rename {activemq-selector/src/main/java/org/apache/activemq => artemis-selector/src/main/java/org/apache/activemq/artemis}/selector/impl/SelectorParser.java (100%) rename {activemq-selector => artemis-selector}/src/main/javacc/HyphenatedParser.jj (100%) rename {activemq-selector => artemis-selector}/src/main/javacc/StrictParser.jj (100%) rename {activemq-selector/src/test/java/org/apache/activemq => artemis-selector/src/test/java/org/apache/activemq/artemis}/selector/SelectorParserTest.java (100%) rename {activemq-selector/src/test/java/org/apache/activemq => artemis-selector/src/test/java/org/apache/activemq/artemis}/selector/SelectorTest.java (100%) rename {activemq-server => artemis-server}/pom.xml (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/api/core/management/MessageCounterInfo.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/BackupStrategy.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/BridgeConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/ClusterConnectionConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/Configuration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/ConfigurationUtils.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/ConnectorServiceConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/CoreQueueConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/DivertConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/FileDeploymentManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/HAPolicyConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/ScaleDownConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/ha/ColocatedPolicyConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/ha/LiveOnlyPolicyConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/ha/ReplicaPolicyConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/ha/ReplicatedPolicyConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/ha/SharedStoreMasterPolicyConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/ha/SharedStoreSlavePolicyConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/impl/ConfigurationImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/impl/FileConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/impl/FileSecurityConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/impl/SecurityConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/config/impl/Validators.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/deployers/Deployable.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/deployers/impl/FileConfigurationParser.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/filter/Filter.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/filter/impl/FilterImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/management/impl/AbstractControl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/management/impl/AcceptorControlImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/management/impl/ActiveMQServerControlImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/management/impl/AddressControlImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/management/impl/BridgeControlImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/management/impl/BroadcastGroupControlImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/management/impl/ClusterConnectionControlImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/management/impl/DivertControlImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/management/impl/MBeanInfoHelper.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/management/impl/QueueControlImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/messagecounter/MessageCounter.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/messagecounter/MessageCounterManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/messagecounter/impl/MessageCounterHelper.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/messagecounter/impl/MessageCounterManagerImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/PageTransactionInfo.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/PagedMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/PagingManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/PagingStore.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/PagingStoreFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/LivePageCache.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/PageCache.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/PageCursorProvider.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/PageIterator.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/PagePosition.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/PageSubscription.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/PageSubscriptionCounter.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/PagedReference.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/PagedReferenceImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/impl/LivePageCacheImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/impl/PageCacheImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/impl/PageCursorProviderImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/impl/PagePositionImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/impl/PageSubscriptionCounterImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/cursor/impl/PageSubscriptionImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/impl/Page.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/impl/PageSyncTimer.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/impl/PageTransactionInfoImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/impl/PagedMessageImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/impl/PagingManagerImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/impl/PagingStoreFactoryNIO.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/paging/impl/PagingStoreImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/GroupingInfo.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/OperationContext.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/QueueBindingInfo.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/StorageManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/config/PersistedAddressSetting.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/config/PersistedRoles.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/impl/PageCountPending.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/impl/journal/AddMessageRecord.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/impl/journal/BatchingIDGenerator.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/impl/journal/DescribeJournal.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/impl/journal/JournalRecordIds.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/impl/journal/JournalStorageManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/impl/journal/LargeServerMessageImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/impl/journal/LargeServerMessageInSync.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/impl/journal/OperationContextImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/persistence/impl/nullpm/NullStorageManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/Address.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/AddressManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/Binding.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/BindingType.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/Bindings.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/BindingsFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/DuplicateIDCache.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/PostOffice.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/QueueBinding.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/QueueInfo.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/impl/AddressImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/impl/BindingsImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/impl/DivertBinding.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/impl/DuplicateIDCacheImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/impl/LocalQueueBinding.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/impl/PostOfficeImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/impl/SimpleAddressManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/postoffice/impl/WildcardAddressManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/ProtocolHandler.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/ServerPacketDecoder.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/ServerSessionPacketHandler.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/ActiveMQPacketHandler.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/CoreProtocolManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/CoreProtocolManagerFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/CoreSessionCallback.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/BackupRequestMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/BackupResponseMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ClusterConnectMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/QuorumVoteMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationAddMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/protocol/stomp/WebSocketServerHandler.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/registry/JndiBindingRegistry.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/registry/MapBindingRegistry.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/invm/InVMAcceptor.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/invm/InVMAcceptorFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/invm/InVMConnection.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/invm/InVMConnector.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/invm/InVMConnectorFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/invm/InVMRegistry.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/invm/TransportConstants.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/ConnectionCreator.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/HttpAcceptorHandler.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/HttpKeepAliveRunnable.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/NettyAcceptor.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/NettyAcceptorFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/impl/netty/NettyServerConnection.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/server/RemotingService.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/remoting/server/impl/RemotingServiceImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/replication/ReplicatedJournal.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/replication/ReplicatedLargeMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/replication/ReplicationEndpoint.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/replication/ReplicationManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/security/CheckType.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/security/SecurityStore.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/security/User.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/security/impl/SecurityStoreImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ActivateCallback.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ActivationParams.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ActiveMQMessageBundle.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ActiveMQServer.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ActiveMQServerLogger.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ActiveMQServers.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/AutoCreatedQueueManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/Bindable.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/BindingQueryResult.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ConnectorService.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ConnectorServiceFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/Consumer.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/Divert.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/HandleStatus.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/JournalType.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/LargeServerMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/LiveNodeLocator.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/MemoryManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/MessageReference.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/NodeManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/Queue.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/QueueCreator.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/QueueFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/RouteContextList.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/RoutingContext.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ScheduledDeliveryHandler.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ServerConsumer.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ServerMessage.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ServerSession.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/ServerSessionFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/TransientQueueManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/BackupManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/Bridge.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/BroadcastGroup.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ClusterConfigurationUtil.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ClusterConnection.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ClusterControl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ClusterController.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ClusterManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/MessageFlowRecord.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/RemoteQueueBinding.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/Transformer.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/BackupPolicy.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/ColocatedHAManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/ColocatedPolicy.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/HAManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/HAPolicy.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/LiveOnlyPolicy.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/ReplicaPolicy.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/ReplicatedPolicy.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/ScaleDownPolicy.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/SharedStoreMasterPolicy.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/SharedStoreSlavePolicy.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/ha/StandaloneHAManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/impl/BridgeImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/impl/BroadcastGroupImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/impl/ClusterConnectionBridge.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/impl/ClusterConnectionImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/impl/Redistributor.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/impl/RemoteQueueBindingImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/qourum/BooleanVote.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/qourum/Quorum.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/qourum/QuorumManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/qourum/QuorumVote.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/qourum/QuorumVoteHandler.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/qourum/QuorumVoteServerConnect.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/qourum/SharedNothingBackupQuorum.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/cluster/qourum/Vote.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/embedded/EmbeddedActiveMQ.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/group/GroupingHandler.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/group/UnproposalListener.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/group/impl/GroupBinding.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/group/impl/GroupHandlingAbstract.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/group/impl/GroupingHandlerConfiguration.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/group/impl/LocalGroupingHandler.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/group/impl/Proposal.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/group/impl/RemoteGroupingHandler.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/group/impl/Response.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/AIOFileLockNodeManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/Activation.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/ActiveMQServerImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/AnyLiveNodeLocatorForReplication.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/AnyLiveNodeLocatorForScaleDown.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/AutoCreatedQueueManagerImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/BackupRecoveryJournalLoader.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/BackupTopologyListener.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/ColocatedActivation.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/ConnectorsService.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/DivertImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/FileLockNodeManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/InVMNodeManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/JournalLoader.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/LastValueQueue.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/LiveActivation.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/LiveOnlyActivation.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/MessageReferenceImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/NamedLiveNodeLocatorForReplication.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/NamedLiveNodeLocatorForScaleDown.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/NamedNodeIdNodeLocator.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/PostOfficeJournalLoader.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/QueueFactoryImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/QueueImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/RefsOperation.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/ReplicationError.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/RoutingContextImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/ScaleDownHandler.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/ScheduledDeliveryHandlerImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/ServerConsumerImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/ServerInfo.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/ServerMessageImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/ServerSessionImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/ServiceRegistry.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/SharedNothingBackupActivation.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/SharedNothingLiveActivation.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/SharedStoreBackupActivation.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/SharedStoreLiveActivation.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/impl/TransientQueueManagerImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/management/ManagementService.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/server/management/impl/ManagementServiceImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/settings/HierarchicalRepository.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/settings/HierarchicalRepositoryChangeListener.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/settings/Mergeable.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/settings/impl/AddressSettings.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/settings/impl/HierarchicalObjectRepository.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/settings/impl/Match.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/settings/impl/SlowConsumerPolicy.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/transaction/ResourceManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/transaction/Transaction.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/transaction/TransactionDetail.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/transaction/TransactionFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/transaction/TransactionOperation.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/transaction/TransactionOperationAbstract.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/transaction/TransactionPropertyIndexes.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/transaction/impl/BindingsTransactionImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/transaction/impl/CoreTransactionDetail.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/transaction/impl/ResourceManagerImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/core/transaction/impl/TransactionImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/naming/BindingRegistry.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/protocol/AbstractProtocolManagerFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/protocol/MessageConverter.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/protocol/ProtocolManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/protocol/ProtocolManagerFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/protocol/SessionCallback.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/Acceptor.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/AcceptorFactory.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/remoting/ServerConnectionLifeCycleListener.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/security/ActiveMQSecurityManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/security/ActiveMQSecurityManagerImpl.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/security/JAASSecurityManager.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/spi/core/security/package-info.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/uri/AcceptorTransportConfigurationParser.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/uri/InVMAcceptorTransportConfigurationSchema.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/uri/TCPAcceptorTransportConfigurationSchema.java (100%) rename {activemq-server/src/main/java/org/apache/activemq => artemis-server/src/main/java/org/apache/activemq/artemis}/utils/XMLConfigurationUtil.java (100%) rename {activemq-server => artemis-server}/src/main/resources/schema/activemq-configuration.xsd (100%) rename {activemq-server => artemis-server}/src/main/resources/schema/activemq-server.xsd (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/config/impl/ConfigurationImplTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/config/impl/DefaultsFileConfigurationTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/config/impl/FileConfigurationParserTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/config/impl/FileConfigurationTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/config/impl/HAPolicyConfigurationTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/config/impl/ValidatorsTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/config/impl/WrongRoleFileConfigurationParserTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/filter/impl/FilterTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/list/PriorityLinkedListTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/message/impl/MessagePropertyTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/security/RoleTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/server/group/impl/ClusteredResetMockTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/server/impl/EmbeddedServerTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/server/impl/ScheduledDeliveryHandlerTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/settings/AddressSettingsTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/settings/RepositoryTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/core/version/impl/VersionImplTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/tests/util/ColocatedActiveMQServer.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/tests/util/CountDownSessionFailureListener.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/tests/util/InVMNodeManagerServer.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/tests/util/RemoveFolder.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/tests/util/ServiceTestBase.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/tests/util/SimpleStringTest.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/tests/util/SingleServerTestBase.java (100%) rename {activemq-server/src/test/java/org/apache/activemq => artemis-server/src/test/java/org/apache/activemq/artemis}/tests/util/UnitTestCase.java (100%) rename {activemq-server => artemis-server}/src/test/resources/ConfigurationTest-defaults.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/ConfigurationTest-full-config.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/InvalidConfigurationTest0.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/InvalidConfigurationTest1.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/InvalidConfigurationTest2.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/InvalidConfigurationTest3.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/InvalidConfigurationTest4.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/InvalidConfigurationTest5.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/colocated-hapolicy-config.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/colocated-hapolicy-config2.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/divertRoutingNameNotRequired.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/live-only-hapolicy-config.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/live-only-hapolicy-config2.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/live-only-hapolicy-config3.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/live-only-hapolicy-config4.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/live-only-hapolicy-config5.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/logging.properties (100%) rename {activemq-server => artemis-server}/src/test/resources/replica-hapolicy-config.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/replica-hapolicy-config2.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/replica-hapolicy-config3.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/replicated-hapolicy-config.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/shared-store-master-hapolicy-config.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/shared-store-slave-hapolicy-config.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/shared-store-slave-hapolicy-config2.xml (100%) rename {activemq-server => artemis-server}/src/test/resources/shared-store-slave-hapolicy-config3.xml (100%) rename {activemq-service-extensions => artemis-service-extensions}/pom.xml (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/ActiveMQServiceExtensionLogger.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/ServiceUtils.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/transactions/TransactionManagerLocator.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/xa/ActiveMQXAResourceWrapper.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/xa/recovery/ActiveMQRegistry.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/xa/recovery/ActiveMQRegistryImpl.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java (100%) rename {activemq-service-extensions/src/main/java/org/apache/activemq => artemis-service-extensions/src/main/java/org/apache/activemq/artemis}/service/extensions/xa/recovery/XARecoveryConfig.java (100%) rename {activemq-service-extensions/src/test/java/org/apache/activemq => artemis-service-extensions/src/test/java/org/apache/activemq/artemis}/service/extensions/tests/transactions/DummyTransactionManagerLocator.java (100%) rename {activemq-service-extensions/src/test/java/org/apache/activemq => artemis-service-extensions/src/test/java/org/apache/activemq/artemis}/service/extensions/tests/transactions/TransactionManagerLocatorTest.java (100%) rename {activemq-service-extensions/src/test/java/org/apache/activemq => artemis-service-extensions/src/test/java/org/apache/activemq/artemis}/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java (100%) rename {activemq-service-extensions/src/test/java/org/apache/activemq => artemis-service-extensions/src/test/java/org/apache/activemq/artemis}/service/extensions/tests/xa/MockActiveMQResourceWrapperFactory.java (100%) rename {activemq-service-extensions/src/test/java/org/apache/activemq => artemis-service-extensions/src/test/java/org/apache/activemq/artemis}/service/extensions/tests/xa/MockXAResource.java (100%) rename {activemq-service-extensions/src/test/java/org/apache/activemq => artemis-service-extensions/src/test/java/org/apache/activemq/artemis}/service/extensions/tests/xa/ServiceUtilsTest.java (100%) rename {activemq-service-extensions => artemis-service-extensions}/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator (100%) rename {activemq-tools => artemis-tools}/pom.xml (100%) rename {activemq-tools/src/main/java/org/apache/activemq => artemis-tools/src/main/java/org/apache/activemq/artemis}/tools/ActiveMQToolsLogger.java (100%) rename {activemq-tools/src/main/java/org/apache/activemq => artemis-tools/src/main/java/org/apache/activemq/artemis}/tools/DataTool.java (100%) rename {activemq-tools/src/main/java/org/apache/activemq => artemis-tools/src/main/java/org/apache/activemq/artemis}/tools/ExportJournal.java (100%) rename {activemq-tools/src/main/java/org/apache/activemq => artemis-tools/src/main/java/org/apache/activemq/artemis}/tools/ImportJournal.java (100%) rename {activemq-tools/src/main/java/org/apache/activemq => artemis-tools/src/main/java/org/apache/activemq/artemis}/tools/Main.java (100%) rename {activemq-tools/src/main/java/org/apache/activemq => artemis-tools/src/main/java/org/apache/activemq/artemis}/tools/PrintData.java (100%) rename {activemq-tools/src/main/java/org/apache/activemq => artemis-tools/src/main/java/org/apache/activemq/artemis}/tools/PrintPages.java (100%) rename {activemq-tools/src/main/java/org/apache/activemq => artemis-tools/src/main/java/org/apache/activemq/artemis}/tools/TransferQueue.java (100%) rename {activemq-tools/src/main/java/org/apache/activemq => artemis-tools/src/main/java/org/apache/activemq/artemis}/tools/XmlDataConstants.java (100%) rename {activemq-tools/src/main/java/org/apache/activemq => artemis-tools/src/main/java/org/apache/activemq/artemis}/tools/XmlDataExporter.java (100%) rename {activemq-tools/src/main/java/org/apache/activemq => artemis-tools/src/main/java/org/apache/activemq/artemis}/tools/XmlDataImporter.java (100%) rename {activemq-web => artemis-web}/pom.xml (100%) rename {activemq-web/src/main/java/org/apache/activemq => artemis-web/src/main/java/org/apache/activemq/artemis}/component/WebServerComponent.java (100%) rename {activemq-web/src/test/java/org/apache/activemq => artemis-web/src/test/java/org/apache/activemq/artemis}/test/WebServerComponentTest.java (100%) rename {activemq-web => artemis-web}/src/test/resources/webapps/WebServerComponentTest.txt (100%) rename {activemq-website => artemis-website}/pom.xml (100%) rename {activemq-website => artemis-website}/src/main/resources/examples/index.html (100%) rename {activemq-website => artemis-website}/src/main/resources/images/activemq-logo.png (100%) rename {activemq-website => artemis-website}/src/main/resources/index.html (100%) rename {activemq-website => artemis-website}/src/main/resources/styles/impact/css/pygmentize.css (100%) rename {activemq-website => artemis-website}/src/main/resources/styles/impact/css/site.css (100%) rename {activemq-website => artemis-website}/src/main/resources/user-manual/index.html (100%) rename distribution/{activemq => artemis}/pom.xml (100%) rename distribution/{activemq => artemis}/src/main/assembly/dep.xml (100%) rename distribution/{activemq => artemis}/src/main/assembly/source-assembly.xml (100%) rename distribution/{activemq => artemis}/src/main/resources/README.html (100%) rename distribution/{activemq => artemis}/src/main/resources/bin/activemq (100%) rename distribution/{activemq => artemis}/src/main/resources/bin/activemq.cmd (100%) rename distribution/{activemq => artemis}/src/main/resources/licenses/bin/LICENSE (100%) rename distribution/{activemq => artemis}/src/main/resources/licenses/bin/NOTICE (100%) rename examples/core/embedded-remote/src/main/java/org/apache/activemq/{ => artemis}/core/example/EmbeddedRemoteExample.java (100%) rename examples/core/embedded-remote/src/main/java/org/apache/activemq/{ => artemis}/core/example/EmbeddedServer.java (100%) rename examples/core/embedded/src/main/java/org/apache/activemq/{ => artemis}/core/example/EmbeddedExample.java (100%) rename examples/core/perf/src/main/java/org/apache/activemq/{ => artemis}/core/example/PerfBase.java (100%) rename examples/core/perf/src/main/java/org/apache/activemq/{ => artemis}/core/example/PerfListener.java (100%) rename examples/core/perf/src/main/java/org/apache/activemq/{ => artemis}/core/example/PerfParams.java (100%) rename examples/core/perf/src/main/java/org/apache/activemq/{ => artemis}/core/example/PerfSender.java (100%) rename examples/core/vertx-connector/src/main/java/org/apache/activemq/{ => artemis}/core/example/ExampleVerticle.java (100%) rename examples/core/vertx-connector/src/main/java/org/apache/activemq/{ => artemis}/core/example/VertxConnectorExample.java (100%) rename examples/jms/aerogear/src/main/java/org/apache/activemq/{ => artemis}/jms/example/AerogearExample.java (100%) rename examples/jms/application-layer-failover/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ApplicationLayerFailoverExample.java (100%) rename examples/jms/{activemq-jms-examples-common => artemis-jms-examples-common}/common.css (100%) rename examples/jms/{activemq-jms-examples-common => artemis-jms-examples-common}/config/logging.properties (100%) rename examples/jms/{activemq-jms-examples-common => artemis-jms-examples-common}/config/server.properties (100%) rename examples/jms/{activemq-jms-examples-common => artemis-jms-examples-common}/pom.xml (100%) rename examples/jms/{activemq-jms-examples-common => artemis-jms-examples-common}/prettify.css (100%) rename examples/jms/{activemq-jms-examples-common => artemis-jms-examples-common}/prettify.js (100%) rename examples/jms/{activemq-jms-examples-common/src/main/java/org/apache/activemq => artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis}/common/example/ActiveMQExample.java (100%) rename examples/jms/{activemq-jms-examples-common/src/main/java/org/apache/activemq => artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis}/common/example/DummyXid.java (100%) rename examples/jms/{activemq-ra-rar => artemis-ra-rar}/pom.xml (100%) rename examples/jms/{activemq-ra-rar => artemis-ra-rar}/src/main/resources/ra.xml (100%) rename examples/jms/bridge/src/main/java/org/apache/activemq/{ => artemis}/jms/example/BridgeExample.java (100%) rename examples/jms/bridge/src/main/java/org/apache/activemq/{ => artemis}/jms/example/HatColourChangeTransformer.java (100%) rename examples/jms/browser/src/main/java/org/apache/activemq/{ => artemis}/jms/example/QueueBrowserExample.java (100%) rename examples/jms/client-kickoff/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ClientKickoffExample.java (100%) rename examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ClientSideFailoverListerExample.java (100%) rename examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ClientSideLoadBalancingExample.java (100%) rename examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ClusteredDurableSubscriptionExample.java (100%) rename examples/jms/clustered-grouping/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ClusteredGroupingExample.java (100%) rename examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ClusteredJgroupsExample.java (100%) rename examples/jms/clustered-queue/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ClusteredQueueExample.java (100%) rename examples/jms/clustered-standalone/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ClusteredStandaloneExample.java (100%) rename examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/{ => artemis}/jms/example/StaticClusteredQueueExample.java (100%) rename examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ClusterStaticOnewayExample.java (100%) rename examples/jms/clustered-topic/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ClusteredTopicExample.java (100%) rename examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ColocatedFailoverScaleDownExample.java (100%) rename examples/jms/colocated-failover/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ColocatedFailoverExample.java (100%) rename examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ConsumerRateLimitExample.java (100%) rename examples/jms/dead-letter/src/main/java/org/apache/activemq/{ => artemis}/jms/example/DeadLetterExample.java (100%) rename examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/{ => artemis}/jms/example/DelayedRedeliveryExample.java (100%) rename examples/jms/divert/src/main/java/org/apache/activemq/{ => artemis}/jms/example/AddForwardingTimeTransformer.java (100%) rename examples/jms/divert/src/main/java/org/apache/activemq/{ => artemis}/jms/example/DivertExample.java (100%) rename examples/jms/durable-subscription/src/main/java/org/apache/activemq/{ => artemis}/jms/example/DurableSubscriptionExample.java (100%) rename examples/jms/embedded-simple/src/main/java/org/apache/activemq/{ => artemis}/jms/example/EmbeddedExample.java (100%) rename examples/jms/embedded/src/main/java/org/apache/activemq/{ => artemis}/jms/example/EmbeddedExample.java (100%) rename examples/jms/expiry/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ExpiryExample.java (100%) rename examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/{ => artemis}/jms/example/HAPolicyAutoBackupExample.java (100%) rename examples/jms/http-transport/src/main/java/org/apache/activemq/{ => artemis}/jms/example/HttpTransportExample.java (100%) rename examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/{ => artemis}/jms/example/InstantiateConnectionFactoryExample.java (100%) rename examples/jms/interceptor/src/main/java/org/apache/activemq/{ => artemis}/jms/example/InterceptorExample.java (100%) rename examples/jms/interceptor/src/main/java/org/apache/activemq/{ => artemis}/jms/example/SimpleInterceptor.java (100%) rename examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/{ => artemis}/jms/example/JMSAutoCloseableExample.java (100%) rename examples/jms/jms-bridge/src/main/java/org/apache/activemq/{ => artemis}/jms/example/JMSBridgeExample.java (100%) rename examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/{ => artemis}/jms/example/JMSCompletionListenerExample.java (100%) rename examples/jms/jms-context/src/main/java/org/apache/activemq/{ => artemis}/jms/example/JMSContextExample.java (100%) rename examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/{ => artemis}/jms/example/JMSSharedConsumerExample.java (100%) rename examples/jms/jmx/src/main/java/org/apache/activemq/{ => artemis}/jms/example/JMXExample.java (100%) rename examples/jms/large-message/src/main/java/org/apache/activemq/{ => artemis}/jms/example/LargeMessageExample.java (100%) rename examples/jms/last-value-queue/src/main/java/org/apache/activemq/{ => artemis}/jms/example/LastValueQueueExample.java (100%) rename examples/jms/management-notifications/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ManagementNotificationExample.java (100%) rename examples/jms/management/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ManagementExample.java (100%) rename examples/jms/message-counters/src/main/java/org/apache/activemq/{ => artemis}/jms/example/MessageCounterExample.java (100%) rename examples/jms/message-group/src/main/java/org/apache/activemq/{ => artemis}/jms/example/MessageGroupExample.java (100%) rename examples/jms/message-group2/src/main/java/org/apache/activemq/{ => artemis}/jms/example/MessageGroup2Example.java (100%) rename examples/jms/message-priority/src/main/java/org/apache/activemq/{ => artemis}/jms/example/MessagePriorityExample.java (100%) rename examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/{ => artemis}/jms/example/MultipleFailoverFailbackExample.java (100%) rename examples/jms/multiple-failover/src/main/java/org/apache/activemq/{ => artemis}/jms/example/MultipleFailoverExample.java (100%) rename examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/{ => artemis}/jms/example/NoConsumerBufferingExample.java (100%) rename examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/{ => artemis}/jms/example/NonTransactionFailoverExample.java (100%) rename examples/jms/openwire/src/main/java/org/apache/activemq/{ => artemis}/jms/example/OpenWireExample.java (100%) rename examples/jms/paging/src/main/java/org/apache/activemq/{ => artemis}/jms/example/PagingExample.java (100%) rename examples/jms/perf/src/main/java/org/apache/activemq/{ => artemis}/jms/example/PerfBase.java (100%) rename examples/jms/perf/src/main/java/org/apache/activemq/{ => artemis}/jms/example/PerfListener.java (100%) rename examples/jms/perf/src/main/java/org/apache/activemq/{ => artemis}/jms/example/PerfParams.java (100%) rename examples/jms/perf/src/main/java/org/apache/activemq/{ => artemis}/jms/example/PerfSender.java (100%) rename examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/{ => artemis}/jms/example/PreacknowledgeExample.java (100%) rename examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ProducerRateLimitExample.java (100%) rename examples/jms/proton-cpp/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ProtonCPPExample.java (100%) rename examples/jms/proton-j/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ProtonJExample.java (100%) rename examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/{ => artemis}/jms/example/QueueMessageRedistributionExample.java (100%) rename examples/jms/queue-requestor/src/main/java/org/apache/activemq/{ => artemis}/jms/example/QueueRequestorExample.java (100%) rename examples/jms/queue-requestor/src/main/java/org/apache/activemq/{ => artemis}/jms/example/TextReverserService.java (100%) rename examples/jms/queue-selector/src/main/java/org/apache/activemq/{ => artemis}/jms/example/QueueSelectorExample.java (100%) rename examples/jms/queue/src/main/java/org/apache/activemq/{ => artemis}/jms/example/QueueExample.java (100%) rename examples/jms/reattach-node/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ReattachExample.java (100%) rename examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ReplicatedFailbackStaticExample.java (100%) rename examples/jms/replicated-failback/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ReplicatedFailbackExample.java (100%) rename examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ReplicatedMultipleFailoverExample.java (100%) rename examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ReplicatedTransactionFailoverExample.java (100%) rename examples/jms/request-reply/src/main/java/org/apache/activemq/{ => artemis}/jms/example/RequestReplyExample.java (100%) rename examples/jms/scale-down/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ScaleDownExample.java (100%) rename examples/jms/scheduled-message/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ScheduledMessageExample.java (100%) rename examples/jms/security/src/main/java/org/apache/activemq/{ => artemis}/jms/example/SecurityExample.java (100%) rename examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/{ => artemis}/jms/example/SendAcknowledgementsExample.java (100%) rename examples/jms/spring-integration/src/main/java/org/apache/activemq/{ => artemis}/jms/example/ExampleListener.java (100%) rename examples/jms/spring-integration/src/main/java/org/apache/activemq/{ => artemis}/jms/example/MessageSender.java (100%) rename examples/jms/spring-integration/src/main/java/org/apache/activemq/{ => artemis}/jms/example/SpringExample.java (100%) rename examples/jms/ssl-enabled/src/main/java/org/apache/activemq/{ => artemis}/jms/example/SSLExample.java (100%) rename examples/jms/static-selector-jms/src/main/java/org/apache/activemq/{ => artemis}/jms/example/StaticSelectorJMSExample.java (100%) rename examples/jms/static-selector/src/main/java/org/apache/activemq/{ => artemis}/jms/example/StaticSelectorExample.java (100%) rename examples/jms/stomp-websockets/src/main/java/org/apache/activemq/{ => artemis}/jms/example/StompWebSocketExample.java (100%) rename examples/jms/stomp/src/main/java/org/apache/activemq/{ => artemis}/jms/example/StompExample.java (100%) rename examples/jms/stomp1.1/src/main/java/org/apache/activemq/{ => artemis}/jms/example/StompExample.java (100%) rename examples/jms/stomp1.2/src/main/java/org/apache/activemq/{ => artemis}/jms/example/StompExample.java (100%) rename examples/jms/stop-server-failover/src/main/java/org/apache/activemq/{ => artemis}/jms/example/StopServerFailoverExample.java (100%) rename examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/{ => artemis}/jms/example/SymmetricClusterExample.java (100%) rename examples/jms/temp-queue/src/main/java/org/apache/activemq/{ => artemis}/jms/example/TemporaryQueueExample.java (100%) rename examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/{ => artemis}/jms/example/TopicHierarchyExample.java (100%) rename examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/{ => artemis}/jms/example/TopicSelectorExample1.java (100%) rename examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/{ => artemis}/jms/example/TopicSelectorExample2.java (100%) rename examples/jms/topic/src/main/java/org/apache/activemq/{ => artemis}/jms/example/TopicExample.java (100%) rename examples/jms/transaction-failover/src/main/java/org/apache/activemq/{ => artemis}/jms/example/TransactionFailoverExample.java (100%) rename examples/jms/transactional/src/main/java/org/apache/activemq/{ => artemis}/jms/example/TransactionalExample.java (100%) rename examples/jms/xa-heuristic/src/main/java/org/apache/activemq/{ => artemis}/jms/example/XAHeuristicExample.java (100%) rename examples/jms/xa-receive/src/main/java/org/apache/activemq/{ => artemis}/jms/example/XAReceiveExample.java (100%) rename examples/jms/xa-send/src/main/java/org/apache/activemq/{ => artemis}/jms/example/XASendExample.java (100%) rename examples/soak/normal/src/main/java/org/apache/activemq/{ => artemis}/jms/soak/example/SoakBase.java (100%) rename examples/soak/normal/src/main/java/org/apache/activemq/{ => artemis}/jms/soak/example/SoakParams.java (100%) rename examples/soak/normal/src/main/java/org/apache/activemq/{ => artemis}/jms/soak/example/SoakReceiver.java (100%) rename examples/soak/normal/src/main/java/org/apache/activemq/{ => artemis}/jms/soak/example/SoakSender.java (100%) rename integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/aerogear/ActiveMQAeroGearBundle.java (100%) rename integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/aerogear/ActiveMQAeroGearLogger.java (100%) rename integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/aerogear/AeroGearConnectorService.java (100%) rename integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/aerogear/AeroGearConnectorServiceFactory.java (100%) rename integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/aerogear/AeroGearConstants.java (100%) rename integration/activemq-spring-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/spring/SpringBindingRegistry.java (100%) rename integration/activemq-spring-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/spring/SpringJmsBootstrap.java (100%) rename integration/activemq-spring-integration/src/main/java/org/apache/activemq/{ => artemis}/spring/ActiveMQSpringBundle.java (100%) rename integration/activemq-spring-integration/src/main/java/org/apache/activemq/{ => artemis}/spring/ActiveMQSpringLogger.java (100%) rename integration/activemq-vertx-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/vertx/ActiveMQVertxLogger.java (100%) rename integration/activemq-vertx-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/vertx/IncomingVertxEventHandler.java (100%) rename integration/activemq-vertx-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/vertx/OutgoingVertxEventHandler.java (100%) rename integration/activemq-vertx-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/vertx/VertxConstants.java (100%) rename integration/activemq-vertx-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/vertx/VertxIncomingConnectorServiceFactory.java (100%) rename integration/activemq-vertx-integration/src/main/java/org/apache/activemq/{ => artemis}/integration/vertx/VertxOutgoingConnectorServiceFactory.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/ExtrasTestLogger.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/ActiveMQMessageHandlerTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/BMFailoverTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/ClosingConnectionTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/ClusteredGroupingTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/GroupingTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/HierarchicalObjectRepositoryTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/JMSBridgeReconnectionTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/LatencyTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/MessageCopyTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/OrphanedConsumerTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/PagingLeakTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/ReplicationBackupTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/ScaleDownFailoverTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/ScaleDownFailureTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/ScaleDownGroupedFailoverTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/ScaleDownGroupedFailureTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/StartStopDeadlockTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/byteman/StompInternalStateTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/jms/bridge/BridgeTestBase.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/jms/bridge/ClusteredBridgeTestBase.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/jms/bridge/JMSBridgeClusteredTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/jms/bridge/JMSBridgeTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/jms/bridge/TransactionManagerLocatorImpl.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/jms/xa/JMSXDeliveryCountTest.java (100%) rename tests/extra-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/extras/jms/xa/XATest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/DuplicateDetectionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/IntegrationTestLogger.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/InterceptorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/SimpleNotificationService.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/String64KLimitTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/aerogear/AeroGearBasicServerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/AckBatchSizeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/AcknowledgeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ActiveMQCrashTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/AddressSettingsTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/AutoCloseCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/AutoCreateJmsQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/AutoDeleteJmsQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/AutogroupIdTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/BlockingSendTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/CommitRollbackTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ConcurrentCreateDeleteProduceTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ConsumerCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ConsumerFilterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ConsumerRoundRobinTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ConsumerStuckTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ConsumerWindowSizeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/CoreClientTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/CreateQueueIdempotentTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/DeadLetterAddressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/DeliveryOrderTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/DurableQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ExpireTestOnRestartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ExpiryAddressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ExpiryLargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/FailureDeadlockTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/HangConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/HeuristicXATest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/InVMNonPersistentMessageBufferTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/InVMPersistentMessageBufferTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/IncompatibleVersionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/InterruptedLargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/JMSMessageCounterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/JMSPagingFileDeleteTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/JmsNettyNioStressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/JournalCrashTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/LargeMessageCompressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/LargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/LibaioDependencyCheckTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/MessageConcurrencyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/MessageConsumerRollbackTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/MessageCounterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/MessageDurabilityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/MessageExpirationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/MessageGroupingConnectionFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/MessageGroupingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/MessageHandlerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/MessagePriorityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/MessageRateTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/MultipleThreadFilterOneTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/NIOvsOIOTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/NettyConnectorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/NettyConsumerWindowSizeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/NettyNonPersistentMessageBufferTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/NettyPersistentMessageBufferTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/NettyProducerFlowControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/NewDeadLetterAddressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/OrderTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/PagingOrderTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/PagingSyncTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/PagingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ProducerCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ProducerFlowControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ProducerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/QueueBrowserTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ReceiveImmediateTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/RedeliveryConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/RequestorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/RoutingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SelfExpandingBufferTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/ServerLocatorConnectTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SessionCloseOnGCTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SessionCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SessionCreateAndDeleteQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SessionCreateConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SessionCreateProducerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SessionFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SessionSendAcknowledgementHandlerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SessionStopStartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SessionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SimpleSendMultipleQueuesTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/SlowConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/TemporaryQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/TransactionDurabilityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/TransactionalSendTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/TransientQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/client/WildCardRoutingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/clientcrash/ClientCrashTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/clientcrash/ClientExitTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/clientcrash/ClientTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/clientcrash/CrashClient.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/clientcrash/CrashClient2.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/clientcrash/DummyInterceptor.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/clientcrash/DummyInterceptorB.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/clientcrash/GracefulClient.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/ClusterControllerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/NodeManagerAction.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/NodeManagerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/RealNodeManagerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/bridge/BridgeFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/bridge/BridgeReconnectTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/bridge/BridgeStartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/bridge/BridgeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/bridge/BridgeTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/bridge/SimpleTransformer.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/ClusterTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/ClusterWithBackupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/ClusteredGroupingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/MessageRedistributionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/NettySymmetricClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/OneWayChainClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/SymmetricClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/AsynchronousFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/BackupAuthenticationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/BackupSyncJournalTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/BackupSyncPagingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/DelayInterceptor.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/DelayInterceptor2.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/DelayInterceptor3.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/FailBackAutoTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/FailBackManualTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/FailoverListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/FailoverOnFlowControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/FailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/FailoverTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/GroupingFailoverTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/LargeMessageFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/LiveToLiveFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/NettyDiscoveryClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/NettyFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/NettyFileStorageDiscoveryClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/NettyFileStorageStaticClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/NettyStaticClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/PagingFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/QuorumFailOverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedDistributionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedFailoverUsingNodeGroupNameTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedLargeMessageFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverNoNodeGroupNameTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedManyMultipleServerFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverNoGroupNodeNameTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/ReplicatedWithDelayFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/SecurityFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/SharedStoreDistributionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/ha/HAAutomaticBackupSharedStore.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/reattach/OrderReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/reattach/RandomReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/reattach/ReattachTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/restart/ClusterRestartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/topology/HAClientTopologyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/topology/IsolatedTopologyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/topology/NettyHAClientTopologyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/topology/NettyHAClientTopologyWithDiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/topology/NonHATopologyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/topology/TopologyClusterTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/util/BackupSyncDelay.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/util/MultiServerTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/util/RemoteServerConfiguration.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/util/SameProcessActiveMQServer.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/cluster/util/TestableServer.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/discovery/DiscoveryBaseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/discovery/DiscoveryStayAliveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/discovery/DiscoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/divert/DivertTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/divert/PersistentDivertTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/embedded/ValidateAIOTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/http/CoreClientOverHttpTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/ActiveMQConnectionFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/FloodServerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/JMSSecurityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/JmsProducerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/ManualReconnectionToSingleServerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/SimpleJNDIClientTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/AutoGroupingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/ConnectionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/CreateQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/ExpiryMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/GroupIDTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/GroupingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/MessageProducerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/MessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/NewQueueRequestorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/NoLocalSubscriberTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/PreACKJMSTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/ReSendMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/ReceiveNoWaitTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/RemoteConnectionStressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/SessionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/StoreConfigTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/TextMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/client/TopicCleanupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/cluster/BindingsClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/cluster/JMSFailoverListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/cluster/JMSFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/cluster/JMSReconnectTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/cluster/TemporaryQueueClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/cluster/TopicClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/connection/CloseConnectionOnGCTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/connection/CloseDestroyedConnectionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/connection/ConcurrentSessionCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/connection/ConnectionFactorySerializationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/connection/ExceptionListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/connection/InvalidConnectorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/consumer/ConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/divert/DivertAndACKClientTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/jms2client/BodyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/jms2client/InvalidDestinationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/jms2client/JmsContextTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/jms2client/NonExistentQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/jms2client/SharedConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/largemessage/JMSLargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/JMSServerDeployerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/JMSServerStartStopTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/config/JMSConfigurationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/config/JMSServerConfigParserTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/ConnectionFactoryControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/JMSMessagingProxy.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/JMSQueueControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/JMSServerControl2Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/JMSServerControlRestartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/JMSServerControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/JMSUtil.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/NullInitialContext.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/TopicControlClusterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/TopicControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/jms/server/management/TopicControlUsingJMSTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/AIOImportExportTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/AIOJournalCompactTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/AIOJournalImplTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/AIOSequentialFileFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/JournalPerfTuneTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/NIOBufferedJournalCompactTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/NIOImportExportTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/NIOJournalCompactTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/NIOJournalImplTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/NIONoBufferJournalImplTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/NIOSequentialFileFactoryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/OldFormatTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/journal/ValidateTransactionHealthTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/largemessage/LargeMessageTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/largemessage/ServerLargeMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/AcceptorControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/AcceptorControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ActiveMQServerControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ActiveMQServerControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/AddressControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/AddressControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/BridgeControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/BridgeControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/BroadcastGroupControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/BroadcastGroupControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ClusterConnectionControl2Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ClusterConnectionControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ClusterConnectionControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/CoreMessagingProxy.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/DivertControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/DivertControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/JMXDomainTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ManagementActivationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ManagementControlHelper.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ManagementHelperTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ManagementServiceImplTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ManagementTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ManagementWithPagingServerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/ManagementWithStompTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/NotificationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/QueueControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/QueueControlUsingCoreTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/SecurityManagementTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/management/SecurityNotificationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/BasicOpenWireTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/BasicSecurityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/OpenWireTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/OpenWireUtilTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/SimpleOpenWireTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer10Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer11Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer12Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer13Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer1Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer2Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer3Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer4Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer5Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer6Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer7Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer8Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSConsumer9Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSDurableTopicRedeliverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSIndividualAckTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSQueueRedeliverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSUsecase1Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JMSUsecaseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsAutoAckListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsAutoAckTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsClientAckTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsConnectionStartStopTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsConsumerResetActiveListenerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsCreateConsumerInOnMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsDurableQueueWildcardSendReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsDurableTopicSelectorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsDurableTopicSendReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsDurableTopicTransactionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsDurableTopicWildcardSendReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsQueueBrowserTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsQueueRequestReplyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsResourceProvider.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsSendReceiveTestSupport.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsTopicRedeliverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsTopicRequestReplyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsTopicSelectorTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsTopicSendReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsTopicSendReceiveWithTwoConnectionsTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsTopicTransactionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/JmsTransactionTestSupport.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/MessageListenerRedeliveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/ProducerFlowControlTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/ReconnectWithSameClientIDTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/RedeliveryPolicyTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/TimeStampTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/amq/TransactionContextTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/interop/GeneralInteropTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/openwire/util/Wait.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/paging/MultipleProducersPagingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/paging/NettyPagingSendTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/paging/PageCountSyncOnNonTXTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/paging/PageCountSyncServer.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/paging/PagingCounterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/paging/PagingReceiveTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/paging/PagingSendTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/paging/PagingWithFailoverAndCountersTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/paging/PagingWithFailoverBackup.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/paging/PagingWithFailoverServer.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/paging/SpawnedServerSupport.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/AddressSettingsConfigurationStorageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/DeleteMessagesOnStartupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/DeleteQueueRestartTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/DuplicateCacheTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/ExportFormatTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/JMSDynamicConfigTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/JMSStorageManagerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/RestartSMTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/RolesConfigurationStorageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/StorageManagerTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/persistence/XmlImportExportTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/proton/ProtonTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/ActiveMQActivationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/ActiveMQClusteredTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/ActiveMQMessageHandlerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/ActiveMQMessageHandlerXATest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/ActiveMQRAClusteredTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/ActiveMQRATestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/DummyTransaction.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/DummyTransactionManager.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/JMSContextTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/OutgoingConnectionTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/OutgoingConnectionTestJTA.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ra/ResourceAdapterTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/remoting/BatchDelayTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/remoting/DestroyConsumerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/remoting/DirectDeliverTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/remoting/NettyNetworkAddressTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/remoting/NettySynchronousCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/remoting/NetworkAddressTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/remoting/PingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/remoting/ReconnectTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/remoting/SynchronousCloseTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/replication/ReplicationOrderTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/replication/ReplicationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/scheduling/DelayedMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/scheduling/MultipliedDelayedMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/scheduling/ScheduledMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/security/NettySecurityClientTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/security/SecurityTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/security/SimpleClient.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/AIOFileLockTimeoutTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/AddressFullLoggingTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/ExpiryRunnerTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/FakeStorageManager.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/FileLockTimeoutTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/GracefulShutdownTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/LVQRecoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/LVQTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/NIOFileLockTimeoutTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/PredefinedQueueTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/ScaleDown3NodeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/ScaleDownDirectTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/ScaleDownTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/SimpleStartStopTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/server/SuppliedThreadPoolTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/spring/ExampleListener.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/spring/MessageSender.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/spring/SpringIntegrationTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ssl/CoreClientOverOneWaySSLTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/ConcurrentStompTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/ExtraStompTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/StompConnectionCleanupTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/StompOverHttpTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/StompOverWebsocketTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/StompTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/StompTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/StompWebSocketTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/AbstractClientStompFrame.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/AbstractStompClientConnection.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/ClientStompFrame.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/ClientStompFrameV10.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/ClientStompFrameV11.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/ClientStompFrameV12.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/StompClientConnection.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/StompClientConnectionFactory.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/StompClientConnectionV10.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/StompClientConnectionV11.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/StompClientConnectionV12.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/StompFrameFactory.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/StompFrameFactoryFactory.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/StompFrameFactoryV10.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/StompFrameFactoryV11.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/util/StompFrameFactoryV12.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/v11/ExtraStompTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/v11/StompV11Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/v11/StompV11TestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/stomp/v12/StompV12Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/tools/TransferMessageTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/transports/netty/ActiveMQFrameDecoder2Test.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/vertx/ActiveMQVertxUnitTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/xa/BasicXaRecoveryTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/xa/BasicXaTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/integration/xa/XaTimeoutTest.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/util/JMSClusteredTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/util/JMSTestBase.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/util/JournalExample.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/util/NonSerializableFactory.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/util/ReplicatedBackupUtils.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/util/TransportConfigurationUtils.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/util/transactions/DummyTransactionManagerLocator.java (100%) rename tests/integration-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/util/transactions/TransactionManagerLocatorTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/AcknowledgementTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/ActiveMQServerTestCase.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/AutoAckMesageListenerTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/BrowserTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/CTSMiscellaneousTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/ConnectionClosedTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/ConnectionFactoryTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/ConnectionTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/ConsumerClosedTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/DeliveryOrderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/DurableSubscriptionTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/JMSTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/JMSTestCase.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/JmsTestLogger.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/MessageConsumerTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/MessageProducerTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/MessageWithReadResolveTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/MiscellaneousTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/NonDurableSubscriberTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/PersistenceTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/QueueReceiverTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/QueueTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/ReferenceableTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/SecurityTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/SessionTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/TemporaryDestinationTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/TopicTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/TransactedSessionTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/BodyIsAssignableFromTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/BytesMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/ExpiredMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/JMSCorrelationIDHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/JMSDeliveryModeHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/JMSDestinationHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/JMSExpirationHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/JMSMessageIDHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/JMSPriorityHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/JMSReplyToHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/JMSTimestampHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/JMSTypeHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/MapMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/MessageBodyTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/MessageBodyTestCase.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/MessageHeaderTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/MessageHeaderTestBase.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/MessagePropertyConversionTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/MessageTestBase.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/ObjectMessageDeliveryTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/ObjectMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/SimpleJMSBytesMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/SimpleJMSMapMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/SimpleJMSMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/SimpleJMSObjectMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/SimpleJMSStreamMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/SimpleJMSTextMessage.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/SomeObject.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/StreamMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/TextMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/foreign/ForeignBytesMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/foreign/ForeignMapMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/foreign/ForeignMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/foreign/ForeignObjectMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/foreign/ForeignStreamMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/foreign/ForeignTestObject.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/message/foreign/ForeignTextMessageTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/selector/SelectorTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/tools/ServerManagement.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/tools/container/Constants.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/tools/container/InVMContext.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/tools/container/InVMInitialContextFactory.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/tools/container/InVMNameParser.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/tools/container/LocalTestServer.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/tools/container/NonSerializableFactory.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/tools/container/Server.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/util/JNDIUtilTest.java (100%) rename tests/jms-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/tests/util/ProxyAssertSupport.java (100%) rename tests/joram-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/AbstractAdmin.java (100%) rename tests/joram-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/ActiveMQAdmin.java (100%) rename tests/joram-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/GenericAdmin.java (100%) rename tests/joram-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/JoramAggregationTest.java (100%) rename tests/joram-tests/src/test/java/org/apache/activemq/{ => artemis}/jms/SpawnedJMSServer.java (100%) rename tests/performance-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/performance/journal/FakeJournalImplTest.java (100%) rename tests/performance-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/performance/journal/JournalImplTestUnit.java (100%) rename tests/performance-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/performance/journal/RealJournalImplAIOTest.java (100%) rename tests/performance-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/performance/journal/RealJournalImplNIOTest.java (100%) rename tests/performance-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/performance/paging/MeasurePagingMultiThreadTest.java (100%) rename tests/performance-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/performance/sends/AbstractSendReceivePerfTest.java (100%) rename tests/performance-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/performance/sends/ClientACKPerf.java (100%) rename tests/performance-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/performance/sends/MeasureCommitPerfTest.java (100%) rename tests/performance-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/performance/sends/PreACKPerf.java (100%) rename tests/soak-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/soak/client/ClientAbstract.java (100%) rename tests/soak-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/soak/client/ClientNonDivertedSoakTest.java (100%) rename tests/soak-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/soak/client/ClientSoakTest.java (100%) rename tests/soak-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/soak/client/Receiver.java (100%) rename tests/soak-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/soak/client/Sender.java (100%) rename tests/soak-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/soak/client/SimpleSendReceiveSoakTest.java (100%) rename tests/soak-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/soak/failover/RandomFailoverSoakTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/chunk/LargeMessageStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/client/SendStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/failover/MultiThreadRandomReattachStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/failover/RandomReattachStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/AIOMultiThreadCompactorStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/AddAndRemoveStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/AllPossibilitiesCompactStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/AllPossibilitiesCompactWithAddDeleteStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/CompactingStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/JournalCleanupCompactStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/JournalRestartStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/LargeJournalStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/MixupCompactorTestBase.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/MultiThreadConsumerStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/NIOMultiThreadCompactorStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/journal/XmlImportExportStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/paging/MultipleConsumersPageStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/paging/PageCursorStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/paging/PageStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/remote/PingStressTest.java (100%) rename tests/stress-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/stress/stomp/StompStressTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/timing/core/journal/impl/AIOJournalImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/timing/core/journal/impl/FakeJournalImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/timing/core/journal/impl/JournalImplTestUnit.java (100%) rename tests/timing-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/timing/core/journal/impl/NIOJournalImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/timing/core/server/impl/QueueConcurrentTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/timing/core/server/impl/QueueImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/timing/util/ReusableLatchTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/timing/util/TokenBucketLimiterImplTest.java (100%) rename tests/timing-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/timing/util/UTF8Test.java (100%) rename tests/timing-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/timing/util/UUIDTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/UnitTestLogger.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/asyncio/AIOTestBase.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/asyncio/AsynchronousFileTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/client/impl/LargeMessageBufferTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/config/impl/ConfigurationValidationTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/config/impl/ConnectorsServiceTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/config/impl/TransportConfigurationTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/config/impl/fakes/FakeConnectorService.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/config/impl/fakes/FakeConnectorServiceFactory.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/AlignedJournalImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/CleanBufferTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/FakeJournalImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/FileFactoryTestBase.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/JournalAsyncTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/JournalImplTestBase.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/JournalImplTestUnit.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/ReclaimerTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/TimedBufferTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/journal/impl/fakes/SimpleEncoding.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/message/impl/MessageImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/paging/impl/PagePositionTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/paging/impl/PageTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/paging/impl/PagingManagerImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/paging/impl/PagingStoreImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/persistence/impl/OperationContextUnitTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/postoffice/impl/AddressImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/postoffice/impl/BindingsImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/postoffice/impl/FakeQueue.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/postoffice/impl/QueueComparatorTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/remoting/ActiveMQBufferTestBase.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/remoting/impl/invm/InVMConnectorFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/remoting/impl/netty/NettyConnectorFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/remoting/server/impl/RemotingServiceImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/remoting/server/impl/fake/FakeInterceptor.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/server/impl/FileLockTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/server/impl/QueueImplTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/server/impl/fakes/FakeConsumer.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/server/impl/fakes/FakeFilter.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/server/impl/fakes/FakeJournalLoader.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/server/impl/fakes/FakePostOffice.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/core/server/impl/fakes/FakeQueueFactory.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/jms/ActiveMQDestinationTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/jms/client/ActiveMQMapMessageTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/jms/client/ActiveMQStreamMessageTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/jms/client/JMSExceptionHelperTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/jms/client/SelectorTranslatorTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/jms/misc/ManifestTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/ra/BootstrapContext.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/ra/ConnectionFactoryPropertiesTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/ra/MessageEndpointFactory.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/ra/ResourceAdapterTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/ActiveMQBufferInputStreamTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/FakePagingManager.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/InVMContext.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/InVMNameParser.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/InVMNamingContext.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/LinkedListTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/MemorySizeTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/NonSerializableFactory.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/ReusableLatchTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/SoftValueMapTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/UTF8Test.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/UUIDGeneratorTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/UUIDTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/unit/util/VersionLoaderTest.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/util/CreateMessage.java (100%) rename tests/unit-tests/src/test/java/org/apache/activemq/{ => artemis}/tests/util/SpawnedVMSupport.java (100%) diff --git a/activemq-boot/pom.xml b/artemis-boot/pom.xml similarity index 100% rename from activemq-boot/pom.xml rename to artemis-boot/pom.xml 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 100% 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 diff --git a/activemq-bootstrap/pom.xml b/artemis-bootstrap/pom.xml similarity index 100% rename from activemq-bootstrap/pom.xml rename to artemis-bootstrap/pom.xml diff --git a/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt b/artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt similarity index 100% rename from activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt rename to artemis-bootstrap/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% rename from activemq-commons/pom.xml rename to artemis-commons/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-core-client/pom.xml b/artemis-core-client/pom.xml similarity index 100% rename from activemq-core-client/pom.xml rename to artemis-core-client/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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/client/loadbalance/package-info.java similarity index 100% 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/client/loadbalance/package-info.java 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/client/package-info.java similarity index 100% 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/client/package-info.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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/api/core/management/package-info.java similarity index 100% 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/api/core/management/package-info.java 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/api/core/package-info.java similarity index 100% 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/api/core/package-info.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/package-info.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/package-info.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/package-info.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/package-info.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/package-info.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/package-info.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiterImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TokenBucketLimiterImpl.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiterImpl.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TokenBucketLimiterImpl.java diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/VersionLoader.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/VersionLoader.java diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/XMLUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/XMLUtil.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XidCodecSupport.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XidCodecSupport.java diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONArray.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONArray.java diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONException.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONException.java diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONObject.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONObject.java diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONString.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONString.java 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 100% 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 diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/package-info.java similarity index 100% rename from activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java rename to artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/package-info.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-dto/pom.xml b/artemis-dto/pom.xml similarity index 100% rename from activemq-dto/pom.xml rename to artemis-dto/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% rename from activemq-jms-client/pom.xml rename to artemis-jms-client/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/package-info.java similarity index 100% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/package-info.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/package-info.java diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/package-info.java similarity index 100% rename from activemq-jms-client/src/main/java/org/apache/activemq/api/jms/package-info.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/package-info.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/package-info.java similarity index 100% rename from activemq-jms-client/src/main/java/org/apache/activemq/jms/client/package-info.java rename to artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/package-info.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-jms-server/pom.xml b/artemis-jms-server/pom.xml similarity index 100% rename from activemq-jms-server/pom.xml rename to artemis-jms-server/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% rename from activemq-journal/pom.xml rename to artemis-journal/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalReaderCallback.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallback.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalReaderCallback.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallbackAbstract.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalReaderCallbackAbstract.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallbackAbstract.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalReaderCallbackAbstract.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecord.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalRecord.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecord.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalRecord.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecordProvider.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalRecordProvider.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecordProvider.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalRecordProvider.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/NIOSequentialFile.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/NIOSequentialFile.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFileFactory.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/NIOSequentialFileFactory.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFileFactory.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/NIOSequentialFileFactory.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/Reclaimer.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/Reclaimer.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SimpleWaitIOCallback.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SimpleWaitIOCallback.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncIOCompletion.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncIOCompletion.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncIOCompletion.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncIOCompletion.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncSpeedTest.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncSpeedTest.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/TimedBuffer.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/TimedBuffer.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBufferObserver.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/TimedBufferObserver.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBufferObserver.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/TimedBufferObserver.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TransactionCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/TransactionCallback.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TransactionCallback.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/TransactionCallback.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/ByteArrayEncoding.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/ByteArrayEncoding.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecord.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalAddRecord.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecord.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalAddRecord.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecordTX.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalAddRecordTX.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecordTX.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalAddRecordTX.java diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalCompleteRecordTX.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalCompleteRecordTX.java similarity index 100% rename from activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalCompleteRecordTX.java rename to artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalCompleteRecordTX.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-maven-plugin/pom.xml b/artemis-maven-plugin/pom.xml similarity index 100% rename from activemq-maven-plugin/pom.xml rename to artemis-maven-plugin/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/InVMNodeManagerServer.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/InVMNodeManagerServer.java similarity index 100% rename from activemq-maven-plugin/src/main/java/org/apache/activemq/maven/InVMNodeManagerServer.java rename to artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/InVMNodeManagerServer.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-native/README b/artemis-native/README similarity index 100% rename from activemq-native/README rename to artemis-native/README diff --git a/activemq-native/bin/libactivemqAIO32.so b/artemis-native/bin/libactivemqAIO32.so similarity index 100% rename from activemq-native/bin/libactivemqAIO32.so rename to artemis-native/bin/libactivemqAIO32.so diff --git a/activemq-native/bin/libactivemqAIO64.so b/artemis-native/bin/libactivemqAIO64.so similarity index 100% rename from activemq-native/bin/libactivemqAIO64.so rename to artemis-native/bin/libactivemqAIO64.so 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 100% rename from activemq-native/pom.xml rename to artemis-native/pom.xml 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 100% rename from activemq-native/src/main/c/JNI_AsynchronousFileImpl.cpp rename to artemis-native/src/main/c/JNI_AsynchronousFileImpl.cpp diff --git a/activemq-native/src/main/c/JavaUtilities.cpp b/artemis-native/src/main/c/JavaUtilities.cpp similarity index 100% rename from activemq-native/src/main/c/JavaUtilities.cpp rename to artemis-native/src/main/c/JavaUtilities.cpp 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 100% rename from activemq-native/src/main/c/Version.h rename to artemis-native/src/main/c/Version.h 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 100% 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 diff --git a/activemq-protocols/activemq-amqp-protocol/pom.xml b/artemis-protocols/artemis-amqp-protocol/pom.xml similarity index 100% rename from activemq-protocols/activemq-amqp-protocol/pom.xml rename to artemis-protocols/artemis-amqp-protocol/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/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 similarity index 100% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/package-info.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/package-info.java 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 100% 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 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 100% 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 diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/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 similarity index 100% rename from activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/package-info.java rename to artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/package-info.java 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 100% 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 diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory b/artemis-protocols/artemis-amqp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory similarity index 100% rename from activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory rename to artemis-protocols/artemis-amqp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory 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 100% 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 diff --git a/activemq-protocols/activemq-openwire-protocol/pom.xml b/artemis-protocols/artemis-openwire-protocol/pom.xml similarity index 100% rename from activemq-protocols/activemq-openwire-protocol/pom.xml rename to artemis-protocols/artemis-openwire-protocol/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory b/artemis-protocols/artemis-openwire-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory similarity index 100% rename from activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory rename to artemis-protocols/artemis-openwire-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory diff --git a/activemq-protocols/activemq-proton-plug/pom.xml b/artemis-protocols/artemis-proton-plug/pom.xml similarity index 100% rename from activemq-protocols/activemq-proton-plug/pom.xml rename to artemis-protocols/artemis-proton-plug/pom.xml 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 100% rename from activemq-protocols/activemq-stomp-protocol/pom.xml rename to artemis-protocols/artemis-stomp-protocol/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory b/artemis-protocols/artemis-stomp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory similarity index 100% rename from activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory rename to artemis-protocols/artemis-stomp-protocol/src/main/resources/META-INF/services/org.apache.activemq.spi.core.protocol.ProtocolManagerFactory diff --git a/activemq-protocols/pom.xml b/artemis-protocols/pom.xml similarity index 100% rename from activemq-protocols/pom.xml rename to artemis-protocols/pom.xml diff --git a/activemq-ra/pom.xml b/artemis-ra/pom.xml similarity index 100% rename from activemq-ra/pom.xml rename to artemis-ra/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-rest/pom.xml b/artemis-rest/pom.xml similarity index 100% rename from activemq-rest/pom.xml rename to artemis-rest/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-rest/src/main/resources/schema/hornetq-rest.xsd b/artemis-rest/src/main/resources/schema/hornetq-rest.xsd similarity index 100% rename from activemq-rest/src/main/resources/schema/hornetq-rest.xsd rename to artemis-rest/src/main/resources/schema/hornetq-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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% rename from activemq-selector/pom.xml rename to artemis-selector/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-selector/src/main/javacc/HyphenatedParser.jj b/artemis-selector/src/main/javacc/HyphenatedParser.jj similarity index 100% rename from activemq-selector/src/main/javacc/HyphenatedParser.jj rename to artemis-selector/src/main/javacc/HyphenatedParser.jj diff --git a/activemq-selector/src/main/javacc/StrictParser.jj b/artemis-selector/src/main/javacc/StrictParser.jj similarity index 100% rename from activemq-selector/src/main/javacc/StrictParser.jj rename to artemis-selector/src/main/javacc/StrictParser.jj 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 100% 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 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 100% 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 diff --git a/activemq-server/pom.xml b/artemis-server/pom.xml similarity index 100% rename from activemq-server/pom.xml rename to artemis-server/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ServerPacketDecoder.java similarity index 100% rename from activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ServerPacketDecoder.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/package-info.java similarity index 100% rename from activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java rename to artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/package-info.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-server/src/main/resources/schema/activemq-configuration.xsd b/artemis-server/src/main/resources/schema/activemq-configuration.xsd similarity index 100% rename from activemq-server/src/main/resources/schema/activemq-configuration.xsd rename to artemis-server/src/main/resources/schema/activemq-configuration.xsd 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/InVMNodeManagerServer.java similarity index 100% rename from activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/InVMNodeManagerServer.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% rename from activemq-server/src/test/resources/ConfigurationTest-full-config.xml rename to artemis-server/src/test/resources/ConfigurationTest-full-config.xml diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml b/artemis-server/src/test/resources/InvalidConfigurationTest0.xml similarity index 100% rename from activemq-server/src/test/resources/InvalidConfigurationTest0.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest0.xml diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml b/artemis-server/src/test/resources/InvalidConfigurationTest1.xml similarity index 100% rename from activemq-server/src/test/resources/InvalidConfigurationTest1.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest1.xml diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml b/artemis-server/src/test/resources/InvalidConfigurationTest2.xml similarity index 100% rename from activemq-server/src/test/resources/InvalidConfigurationTest2.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest2.xml diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml b/artemis-server/src/test/resources/InvalidConfigurationTest3.xml similarity index 100% rename from activemq-server/src/test/resources/InvalidConfigurationTest3.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest3.xml diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml b/artemis-server/src/test/resources/InvalidConfigurationTest4.xml similarity index 100% rename from activemq-server/src/test/resources/InvalidConfigurationTest4.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest4.xml diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml b/artemis-server/src/test/resources/InvalidConfigurationTest5.xml similarity index 100% rename from activemq-server/src/test/resources/InvalidConfigurationTest5.xml rename to artemis-server/src/test/resources/InvalidConfigurationTest5.xml 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 100% rename from activemq-server/src/test/resources/logging.properties rename to artemis-server/src/test/resources/logging.properties 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 100% rename from activemq-service-extensions/pom.xml rename to artemis-service-extensions/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/transactions/DummyTransactionManagerLocator.java b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/transactions/DummyTransactionManagerLocator.java similarity index 100% rename from activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/transactions/DummyTransactionManagerLocator.java rename to artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/transactions/DummyTransactionManagerLocator.java diff --git a/activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/transactions/TransactionManagerLocatorTest.java b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/transactions/TransactionManagerLocatorTest.java similarity index 100% rename from activemq-service-extensions/src/test/java/org/apache/activemq/service/extensions/tests/transactions/TransactionManagerLocatorTest.java rename to artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/transactions/TransactionManagerLocatorTest.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-service-extensions/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator b/artemis-service-extensions/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator similarity index 100% rename from activemq-service-extensions/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator rename to artemis-service-extensions/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator diff --git a/activemq-tools/pom.xml b/artemis-tools/pom.xml similarity index 100% rename from activemq-tools/pom.xml rename to artemis-tools/pom.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/activemq-web/pom.xml b/artemis-web/pom.xml similarity index 100% rename from activemq-web/pom.xml rename to artemis-web/pom.xml 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 100% 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 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 100% 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 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 100% rename from activemq-website/pom.xml rename to artemis-website/pom.xml diff --git a/activemq-website/src/main/resources/examples/index.html b/artemis-website/src/main/resources/examples/index.html similarity index 100% rename from activemq-website/src/main/resources/examples/index.html rename to artemis-website/src/main/resources/examples/index.html 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 100% rename from activemq-website/src/main/resources/index.html rename to artemis-website/src/main/resources/index.html 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 100% rename from activemq-website/src/main/resources/user-manual/index.html rename to artemis-website/src/main/resources/user-manual/index.html diff --git a/distribution/activemq/pom.xml b/distribution/artemis/pom.xml similarity index 100% rename from distribution/activemq/pom.xml rename to distribution/artemis/pom.xml diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/artemis/src/main/assembly/dep.xml similarity index 100% rename from distribution/activemq/src/main/assembly/dep.xml rename to distribution/artemis/src/main/assembly/dep.xml 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 100% rename from distribution/activemq/src/main/resources/README.html rename to distribution/artemis/src/main/resources/README.html diff --git a/distribution/activemq/src/main/resources/bin/activemq b/distribution/artemis/src/main/resources/bin/activemq similarity index 100% rename from distribution/activemq/src/main/resources/bin/activemq rename to distribution/artemis/src/main/resources/bin/activemq diff --git a/distribution/activemq/src/main/resources/bin/activemq.cmd b/distribution/artemis/src/main/resources/bin/activemq.cmd similarity index 100% rename from distribution/activemq/src/main/resources/bin/activemq.cmd rename to distribution/artemis/src/main/resources/bin/activemq.cmd 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 100% rename from distribution/activemq/src/main/resources/licenses/bin/NOTICE rename to distribution/artemis/src/main/resources/licenses/bin/NOTICE 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfListener.java similarity index 100% rename from examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java rename to examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfListener.java 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 100% 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 diff --git a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfSender.java similarity index 100% rename from examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java rename to examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfSender.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% rename from examples/jms/activemq-jms-examples-common/config/logging.properties rename to examples/jms/artemis-jms-examples-common/config/logging.properties diff --git a/examples/jms/activemq-jms-examples-common/config/server.properties b/examples/jms/artemis-jms-examples-common/config/server.properties similarity index 100% rename from examples/jms/activemq-jms-examples-common/config/server.properties rename to examples/jms/artemis-jms-examples-common/config/server.properties diff --git a/examples/jms/activemq-jms-examples-common/pom.xml b/examples/jms/artemis-jms-examples-common/pom.xml similarity index 100% rename from examples/jms/activemq-jms-examples-common/pom.xml rename to examples/jms/artemis-jms-examples-common/pom.xml 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 100% 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 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 100% 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 diff --git a/examples/jms/activemq-ra-rar/pom.xml b/examples/jms/artemis-ra-rar/pom.xml similarity index 100% rename from examples/jms/activemq-ra-rar/pom.xml rename to examples/jms/artemis-ra-rar/pom.xml 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 100% rename from examples/jms/activemq-ra-rar/src/main/resources/ra.xml rename to examples/jms/artemis-ra-rar/src/main/resources/ra.xml 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java b/examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfListener.java similarity index 100% rename from examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java rename to examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfListener.java 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 100% 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 diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java b/examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfSender.java similarity index 100% rename from examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java rename to examples/jms/perf/src/main/java/org/apache/activemq/artemis/jms/example/PerfSender.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/DummyTransactionManagerLocator.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/transactions/DummyTransactionManagerLocator.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/DummyTransactionManagerLocator.java rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/transactions/DummyTransactionManagerLocator.java diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/TransactionManagerLocatorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/transactions/TransactionManagerLocatorTest.java similarity index 100% rename from tests/integration-tests/src/test/java/org/apache/activemq/tests/util/transactions/TransactionManagerLocatorTest.java rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/transactions/TransactionManagerLocatorTest.java 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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